From c458cebfc360b748fccc4f2ec7a0b3d94320ad78 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Thu, 15 Jul 2021 21:16:35 +0200
Subject: [PATCH 01/77] FIX: User's "Top badges" grid (#13752)

Fixes a regression introduced in #13719
---
 .../discourse/app/templates/user/summary.hbs     | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/templates/user/summary.hbs b/app/assets/javascripts/discourse/app/templates/user/summary.hbs
index de025dbf16..1199c4bf82 100644
--- a/app/assets/javascripts/discourse/app/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/summary.hbs
@@ -151,13 +151,21 @@
     {{#if siteSettings.enable_badges}}
       <div class="top-section badges-section">
         <h3 class="stats-title">{{i18n "user.summary.top_badges"}}</h3>
-        {{#each model.badges as |badge|}}
-          {{badge-card badge=badge count=badge.count username=user.username_lower}}
+
+        {{#if model.badges}}
+          <div class="badge-group-list">
+            {{#each model.badges as |badge|}}
+              {{badge-card badge=badge count=badge.count username=user.username_lower}}
+            {{/each}}
+          </div>
         {{else}}
           <p>{{i18n "user.summary.no_badges"}}</p>
-        {{/each}}
+        {{/if}}
+
         {{#if moreBadges}}
-          <p>{{#link-to "user.badges" user class="more"}}{{i18n "user.summary.more_badges"}}{{/link-to}}</p>
+          {{#link-to "user.badges" user class="more"}}
+            {{i18n "user.summary.more_badges"}}
+          {{/link-to}}
         {{/if}}
       </div>
     {{/if}}

From 23773b3f19929819383af433bc1d261c8af8c863 Mon Sep 17 00:00:00 2001
From: Tobias Eigen <tobiaseigen@gmail.com>
Date: Thu, 15 Jul 2021 13:22:21 -0700
Subject: [PATCH 02/77] updated copy for reply_as_new_group_message (#13754)

I changed from "Create a new private message with the same recipients" to "Create new message starting with same recipients".

Wanting to remove "private message" because these messages are not private (admins can read them). Also want to communicate that this is a way to expand the conversation to new people without having to explicitly invite them to the current message, or give them access to the past discussions.

ref: https://dev.discourse.org/t/bring-invite-to-message-in-line-with-new-invite-system/49578/12?u=tobiaseigen

ref: https://meta.discourse.org/t/how-do-you-add-another-person-to-a-private-message-when-its-already-sent/43357/8?u=tobiaseigen
---
 config/locales/client.en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 6ffc48acc9..b08d134030 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2132,7 +2132,7 @@ en:
           confirm: You have a new topic draft saved, which will be overwritten if you create a linked topic.
         reply_as_new_group_message:
           label: Reply as new group message
-          desc: Create a new private message with the same recipients
+          desc: Create new message starting with same recipients
         reply_as_private_message:
           label: New message
           desc: Create a new personal message

From 8bdec18d5840105717ae8948aaf2699d683d896e Mon Sep 17 00:00:00 2001
From: Tobias Eigen <tobiaseigen@gmail.com>
Date: Thu, 15 Jul 2021 13:22:57 -0700
Subject: [PATCH 03/77] changed private message -> personal message (#13753)

We are trying to not use "private message" in the interface, in favor of "personal message", because of course admins can read all messages so they are not really private unless encrypted messaging is turned on..
---
 config/locales/client.en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index b08d134030..0066ca2ee6 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -337,7 +337,7 @@ en:
       remove: "Remove"
       remove_confirmation: "Are you sure you want to delete this draft?"
       new_topic: "New topic draft"
-      new_private_message: "New private message draft"
+      new_private_message: "New personal message draft"
       topic_reply: "Draft reply"
       abandon:
         confirm: "You have a draft in progress for this topic. What would you like to do with it?"

From 7323c65d535dcff92290c83127b622c91e3029e9 Mon Sep 17 00:00:00 2001
From: Osama Sayegh <asooomaasoooma90@gmail.com>
Date: Fri, 16 Jul 2021 05:51:13 +0300
Subject: [PATCH 04/77] FIX: Debounce group name validation correctly (#13757)

---
 .../components/groups-form-profile-fields.js  | 76 +++++++++----------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/groups-form-profile-fields.js b/app/assets/javascripts/discourse/app/components/groups-form-profile-fields.js
index d2a439ed54..43fb8c4d70 100644
--- a/app/assets/javascripts/discourse/app/components/groups-form-profile-fields.js
+++ b/app/assets/javascripts/discourse/app/components/groups-form-profile-fields.js
@@ -57,52 +57,50 @@ export default Component.extend({
       );
     }
 
-    this.checkGroupName();
+    this.checkGroupNameDebounced();
 
     return this._failedInputValidation(
       I18n.t("admin.groups.new.name.checking")
     );
   },
 
-  checkGroupName() {
-    discourseDebounce(
-      this,
-      function () {
-        if (isEmpty(this.nameInput)) {
-          return;
+  checkGroupNameDebounced() {
+    discourseDebounce(this, this._checkGroupName, 500);
+  },
+
+  _checkGroupName() {
+    if (isEmpty(this.nameInput)) {
+      return;
+    }
+
+    Group.checkName(this.nameInput)
+      .then((response) => {
+        const validationName = "uniqueNameValidation";
+
+        if (response.available) {
+          this.set(
+            validationName,
+            EmberObject.create({
+              ok: true,
+              reason: I18n.t("admin.groups.new.name.available"),
+            })
+          );
+
+          this.set("disableSave", false);
+          this.set("model.name", this.nameInput);
+        } else {
+          let reason;
+
+          if (response.errors) {
+            reason = response.errors.join(" ");
+          } else {
+            reason = I18n.t("admin.groups.new.name.not_available");
+          }
+
+          this.set(validationName, this._failedInputValidation(reason));
         }
-
-        Group.checkName(this.nameInput)
-          .then((response) => {
-            const validationName = "uniqueNameValidation";
-
-            if (response.available) {
-              this.set(
-                validationName,
-                EmberObject.create({
-                  ok: true,
-                  reason: I18n.t("admin.groups.new.name.available"),
-                })
-              );
-
-              this.set("disableSave", false);
-              this.set("model.name", this.nameInput);
-            } else {
-              let reason;
-
-              if (response.errors) {
-                reason = response.errors.join(" ");
-              } else {
-                reason = I18n.t("admin.groups.new.name.not_available");
-              }
-
-              this.set(validationName, this._failedInputValidation(reason));
-            }
-          })
-          .catch(popupAjaxError);
-      },
-      500
-    );
+      })
+      .catch(popupAjaxError);
   },
 
   _failedInputValidation(reason) {

From 444e21b12d4a98768f839ecffd8d2e60ade44b64 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 16 Jul 2021 04:10:04 +0100
Subject: [PATCH 05/77] FEATURE: Add 'users.list' API scope (#13742)

---
 app/models/api_key_scope.rb  | 1 +
 config/locales/client.en.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/models/api_key_scope.rb b/app/models/api_key_scope.rb
index 2bf69db9f2..f4cb44e2f8 100644
--- a/app/models/api_key_scope.rb
+++ b/app/models/api_key_scope.rb
@@ -41,6 +41,7 @@ class ApiKeyScope < ActiveRecord::Base
           log_out: { actions: %w[admin/users#log_out] },
           anonymize: { actions: %w[admin/users#anonymize] },
           delete: { actions: %w[admin/users#destroy] },
+          list: { actions: %w[admin/users#index] },
         },
         email: {
           receive_emails: { actions: %w[admin/email#handle_mail] }
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 0066ca2ee6..81484815c4 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4023,6 +4023,7 @@ en:
               log_out: Log out all sessions for a user.
               anonymize: Anonymize user accounts.
               delete: Delete user accounts.
+              list: Get a list of users.
             email:
               receive_emails: Combine this scope with the mail-receiver to process incoming emails.
 

From 1cadae38796cd221a40258f2e70a148f2f928d31 Mon Sep 17 00:00:00 2001
From: Andrei Prigorshnev <a.prigorshnev@gmail.com>
Date: Fri, 16 Jul 2021 07:13:00 +0400
Subject: [PATCH 06/77] FIX: simplify and improve choosing favorite badges
 (#13743)

* No need to return anything except a status code from the server

* Switch a badge state before sending a request and then switch it back in case of an error
---
 .../discourse/app/models/user-badge.js        | 14 ++++++-----
 app/controllers/user_badges_controller.rb     |  6 +----
 spec/requests/user_badges_controller_spec.rb  | 24 +++++--------------
 3 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/models/user-badge.js b/app/assets/javascripts/discourse/app/models/user-badge.js
index 07467f3909..2bba997031 100644
--- a/app/assets/javascripts/discourse/app/models/user-badge.js
+++ b/app/assets/javascripts/discourse/app/models/user-badge.js
@@ -22,12 +22,14 @@ const UserBadge = EmberObject.extend({
   },
 
   favorite() {
-    return ajax(`/user_badges/${this.id}/toggle_favorite`, { type: "PUT" })
-      .then((json) => {
-        this.set("is_favorite", json.user_badge.is_favorite);
-        return this;
-      })
-      .catch(popupAjaxError);
+    this.toggleProperty("is_favorite");
+    return ajax(`/user_badges/${this.id}/toggle_favorite`, {
+      type: "PUT",
+    }).catch((e) => {
+      // something went wrong, switch the UI back:
+      this.toggleProperty("is_favorite");
+      popupAjaxError(e);
+    });
   },
 });
 
diff --git a/app/controllers/user_badges_controller.rb b/app/controllers/user_badges_controller.rb
index 60b1275461..abf2b9f054 100644
--- a/app/controllers/user_badges_controller.rb
+++ b/app/controllers/user_badges_controller.rb
@@ -109,14 +109,10 @@ class UserBadgesController < ApplicationController
       return render json: failed_json, status: 400
     end
 
-    new_is_favorite_value = !user_badge.is_favorite
     UserBadge
       .where(user_id: user_badge.user_id, badge_id: user_badge.badge_id)
-      .update_all(is_favorite: new_is_favorite_value)
+      .update_all(is_favorite: !user_badge.is_favorite)
     UserBadge.update_featured_ranks!(user_badge.user_id)
-
-    user_badge.is_favorite = new_is_favorite_value
-    render_serialized(user_badge, DetailedUserBadgeSerializer, root: :user_badge)
   end
 
   private
diff --git a/spec/requests/user_badges_controller_spec.rb b/spec/requests/user_badges_controller_spec.rb
index 4c17ac2763..4154f5ba98 100644
--- a/spec/requests/user_badges_controller_spec.rb
+++ b/spec/requests/user_badges_controller_spec.rb
@@ -288,17 +288,14 @@ describe UserBadgesController do
       SiteSetting.max_favorite_badges = 3
 
       put "/user_badges/#{user_badge.id}/toggle_favorite.json"
-      expect(response.status).to eq(200)
+      expect(response.status).to eq(204)
     end
 
     it "favorites a badge" do
       sign_in(user)
       put "/user_badges/#{user_badge.id}/toggle_favorite.json"
 
-      expect(response.status).to eq(200)
-      parsed = response.parsed_body
-      expect(parsed["user_badge"]["is_favorite"]).to eq(true)
-
+      expect(response.status).to eq(204)
       user_badge = UserBadge.find_by(user: user, badge: badge)
       expect(user_badge.is_favorite).to eq(true)
     end
@@ -308,10 +305,7 @@ describe UserBadgesController do
       user_badge.toggle!(:is_favorite)
       put "/user_badges/#{user_badge.id}/toggle_favorite.json"
 
-      expect(response.status).to eq(200)
-      parsed = response.parsed_body
-      expect(parsed["user_badge"]["is_favorite"]).to eq(false)
-
+      expect(response.status).to eq(204)
       user_badge = UserBadge.find_by(user: user, badge: badge)
       expect(user_badge.is_favorite).to eq(false)
     end
@@ -328,23 +322,17 @@ describe UserBadgesController do
       other_user_badge = UserBadge.create(badge: other_badge, user: user, granted_by: Discourse.system_user, granted_at: Time.now)
 
       put "/user_badges/#{user_badge.id}/toggle_favorite.json"
-      expect(response.status).to eq(200)
-      parsed = response.parsed_body
-      expect(parsed["user_badge"]["is_favorite"]).to eq(false)
+      expect(response.status).to eq(204)
       expect(user_badge.reload.is_favorite).to eq(false)
       expect(user_badge2.reload.is_favorite).to eq(false)
 
       put "/user_badges/#{user_badge.id}/toggle_favorite.json"
-      expect(response.status).to eq(200)
-      parsed = response.parsed_body
-      expect(parsed["user_badge"]["is_favorite"]).to eq(true)
+      expect(response.status).to eq(204)
       expect(user_badge.reload.is_favorite).to eq(true)
       expect(user_badge2.reload.is_favorite).to eq(true)
 
       put "/user_badges/#{other_user_badge.id}/toggle_favorite.json"
-      expect(response.status).to eq(200)
-      parsed = response.parsed_body
-      expect(parsed["user_badge"]["is_favorite"]).to eq(true)
+      expect(response.status).to eq(204)
       expect(other_user_badge.reload.is_favorite).to eq(true)
     end
   end

From 207c3085fc377e5f08c1002c9913eed3c4debdd6 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Thu, 15 Jul 2021 23:43:31 -0400
Subject: [PATCH 07/77] DEV: Refactor stylesheet live-reloading (#13755)

We have had reports of tabs freezing in Firefox, and reporting an error
in this line. I haven't been able to reproduce, but I suspect the
`forEach` loop is at the heart of the issue, so I have replaced it with
(hopefully) a safer call.

* More refactoring
* Do not reload stylesheets with unchanged filenames
* Select last matching stylesheet
---
 .../app/initializers/live-development.js      | 39 ++++++++++---------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/initializers/live-development.js b/app/assets/javascripts/discourse/app/initializers/live-development.js
index bf92d0e2c2..7b0c207082 100644
--- a/app/assets/javascripts/discourse/app/initializers/live-development.js
+++ b/app/assets/javascripts/discourse/app/initializers/live-development.js
@@ -60,12 +60,22 @@ export default {
             // Refresh if necessary
             document.location.reload(true);
           } else if (me.new_href && me.target) {
-            const link_target = me.theme_id
-              ? `[data-target="${me.target}"][data-theme-id="${me.theme_id}"]`
-              : `[data-target="${me.target}"]`;
-            document.querySelectorAll(`link${link_target}`).forEach((link) => {
-              this.refreshCSS(link, me.new_href);
-            });
+            const link_target = !!me.theme_id
+              ? `[data-target='${me.target}'][data-theme-id='${me.theme_id}']`
+              : `[data-target='${me.target}']`;
+
+            const links = document.querySelectorAll(`link${link_target}`);
+            if (links.length > 0) {
+              const lastLink = links[links.length - 1];
+              // this check is useful when message-bus has multiple file updates
+              // it avoids the browser doing a lot of work for nothing
+              // should the filenames be unchanged
+              if (
+                lastLink.href.split("/").pop() !== me.new_href.split("/").pop()
+              ) {
+                this.refreshCSS(lastLink, me.new_href);
+              }
+            }
           }
         });
       },
@@ -74,21 +84,14 @@ export default {
   },
 
   refreshCSS(node, newHref) {
-    if (node.dataset.reloading) {
-      clearTimeout(node.dataset.timeout);
-    }
-
-    node.dataset.reloading = true;
-
     let reloaded = node.cloneNode(true);
     reloaded.href = newHref;
     node.insertAdjacentElement("afterend", reloaded);
 
-    let timeout = setTimeout(() => {
-      node.parentNode.removeChild(node);
-      reloaded.dataset.reloading = false;
-    }, 2000);
-
-    node.dataset.timeout = timeout;
+    setTimeout(() => {
+      if (node && node.parentNode) {
+        node.parentNode.removeChild(node);
+      }
+    }, 500);
   },
 };

From c4d7545f356582d280ffeba2637b15392ad21fa0 Mon Sep 17 00:00:00 2001
From: Andrei Prigorshnev <a.prigorshnev@gmail.com>
Date: Fri, 16 Jul 2021 11:56:51 +0400
Subject: [PATCH 08/77] FIX: when updating timestamps on topic set a correct
 bump date (#13746)

There was a bug with changing timestamps using the topic wrench button. Under some circumstances, a topic was disappearing from the top of the latest tab after changing timestamps. Steps to reproduce:
- Choose a topic on the latest tab (the topic should be created some time ago, but has recent posts)
- Change topic timestamps (for example, move them one day forward):
- Go back to the latest tab and see that topic has disappeared.

This PR fixes this. We were setting topic.bumped_at to the timestamp user specified on the modal. This is incorrect. Instead, we should be setting topic.bumped_at to the created_at timestamp of the last regular (not a whisper and so on) post on the topic.
---
 app/services/topic_timestamp_changer.rb       |  2 +-
 spec/services/topic_timestamp_changer_spec.rb | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/services/topic_timestamp_changer.rb b/app/services/topic_timestamp_changer.rb
index d02cda99f4..a8d5059c4d 100644
--- a/app/services/topic_timestamp_changer.rb
+++ b/app/services/topic_timestamp_changer.rb
@@ -29,6 +29,7 @@ class TopicTimestampChanger
         end
       end
 
+      @topic.reset_bumped_at
       update_topic(last_posted_at)
 
       yield(@topic) if block_given?
@@ -48,7 +49,6 @@ class TopicTimestampChanger
     @topic.update(
       created_at: @timestamp,
       updated_at: @timestamp,
-      bumped_at: @timestamp,
       last_posted_at: last_posted_at
     )
   end
diff --git a/spec/services/topic_timestamp_changer_spec.rb b/spec/services/topic_timestamp_changer_spec.rb
index c94cecfb92..255530f68c 100644
--- a/spec/services/topic_timestamp_changer_spec.rb
+++ b/spec/services/topic_timestamp_changer_spec.rb
@@ -26,19 +26,20 @@ describe TopicTimestampChanger do
         TopicTimestampChanger.new(topic: topic, timestamp: new_timestamp.to_f).change!
 
         topic.reload
+        p1.reload
+        p2.reload
+        last_post_created_at = p2.created_at
+
         expect(topic.created_at).to eq_time(new_timestamp)
         expect(topic.updated_at).to eq_time(new_timestamp)
-        expect(topic.bumped_at).to eq_time(new_timestamp)
+        expect(topic.bumped_at).to eq_time(last_post_created_at)
+        expect(topic.last_posted_at).to eq_time(last_post_created_at)
 
-        p1.reload
         expect(p1.created_at).to eq_time(new_timestamp)
         expect(p1.updated_at).to eq_time(new_timestamp)
 
-        p2.reload
         expect(p2.created_at).to eq_time(new_timestamp + 1.day)
         expect(p2.updated_at).to eq_time(new_timestamp + 1.day)
-
-        expect(topic.last_posted_at).to eq_time(p2.reload.created_at)
       end
 
       describe 'when posts have timestamps in the future' do

From 810892139b2d27fb87a823180bb092db6bdfad8d Mon Sep 17 00:00:00 2001
From: Osama Sayegh <asooomaasoooma90@gmail.com>
Date: Fri, 16 Jul 2021 11:02:24 +0300
Subject: [PATCH 09/77] FIX: Ascending/descending sorting in the group
 membership requests page

The `GroupsController#members` endpoint accepts a `desc` parameter to determine how members are sorted, but it's been deprecated in favor of a boolean `asc` parameter. However, in the frontend, specifically the group membership requests page was not updated entirely to use the `asc` param and it still passes a `desc` param when changing how group requests are sorted.

This commit updates the `group-requests` Ember controller so it passes a boolean `asc` param and removes all references of `desc`. The controller view/template has already been updated to use `asc`:

https://github.com/discourse/discourse/blob/207c3085fc377e5f08c1002c9913eed3c4debdd6/app/assets/javascripts/discourse/app/templates/group-requests.hbs#L15-L16
---
 .../discourse/app/controllers/group-requests.js      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/group-requests.js b/app/assets/javascripts/discourse/app/controllers/group-requests.js
index 73da360192..9cb4dcf3a6 100644
--- a/app/assets/javascripts/discourse/app/controllers/group-requests.js
+++ b/app/assets/javascripts/discourse/app/controllers/group-requests.js
@@ -7,10 +7,10 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
 export default Controller.extend({
   application: controller(),
 
-  queryParams: ["order", "desc", "filter"],
+  queryParams: ["order", "asc", "filter"],
 
   order: "",
-  desc: null,
+  asc: null,
   filter: null,
   filterInput: null,
 
@@ -27,7 +27,7 @@ export default Controller.extend({
     );
   },
 
-  @observes("order", "desc", "filter")
+  @observes("order", "asc", "filter")
   _filtersChanged() {
     this.findRequesters(true);
   },
@@ -57,9 +57,9 @@ export default Controller.extend({
     });
   },
 
-  @discourseComputed("order", "desc", "filter")
-  memberParams(order, desc, filter) {
-    return { order, desc, filter };
+  @discourseComputed("order", "asc", "filter")
+  memberParams(order, asc, filter) {
+    return { order, asc, filter };
   },
 
   @discourseComputed("model.requesters.[]")

From 361c8be547342d6c297eaea51b007594e41bbdf1 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Fri, 16 Jul 2021 10:58:01 -0400
Subject: [PATCH 10/77] PERF: Add scheduled job to delete old stylesheet cache
 rows (#13747)

---
 .../scheduled/clean_up_stylesheet_cache.rb    | 11 ++++++++++
 app/models/stylesheet_cache.rb                |  5 +++++
 spec/models/stylesheet_cache_spec.rb          | 22 ++++++++++++++++++-
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 app/jobs/scheduled/clean_up_stylesheet_cache.rb

diff --git a/app/jobs/scheduled/clean_up_stylesheet_cache.rb b/app/jobs/scheduled/clean_up_stylesheet_cache.rb
new file mode 100644
index 0000000000..51913a4f4b
--- /dev/null
+++ b/app/jobs/scheduled/clean_up_stylesheet_cache.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Jobs
+  class CleanUpStylesheetCache < ::Jobs::Scheduled
+    every 1.week
+
+    def execute(args)
+      StylesheetCache.clean_up
+    end
+  end
+end
diff --git a/app/models/stylesheet_cache.rb b/app/models/stylesheet_cache.rb
index 03d921c076..819f9ab366 100644
--- a/app/models/stylesheet_cache.rb
+++ b/app/models/stylesheet_cache.rb
@@ -4,6 +4,7 @@ class StylesheetCache < ActiveRecord::Base
   self.table_name = 'stylesheet_cache'
 
   MAX_TO_KEEP = 50
+  CLEANUP_AFTER_DAYS = 150
 
   def self.add(target, digest, content, source_map, max_to_keep: nil)
     max_to_keep ||= MAX_TO_KEEP
@@ -42,6 +43,10 @@ class StylesheetCache < ActiveRecord::Base
     end
   end
 
+  def self.clean_up
+    StylesheetCache.where('created_at < ?', CLEANUP_AFTER_DAYS.days.ago).delete_all
+  end
+
 end
 
 # == Schema Information
diff --git a/spec/models/stylesheet_cache_spec.rb b/spec/models/stylesheet_cache_spec.rb
index c83f6c5786..d47e9150ab 100644
--- a/spec/models/stylesheet_cache_spec.rb
+++ b/spec/models/stylesheet_cache_spec.rb
@@ -4,7 +4,7 @@ require 'rails_helper'
 
 describe StylesheetCache do
 
-  describe "add" do
+  describe ".add" do
     it "correctly cycles once MAX_TO_KEEP is hit" do
       StylesheetCache.destroy_all
 
@@ -37,6 +37,26 @@ describe StylesheetCache do
 
       expect(StylesheetCache.order(:id).pluck(:target)).to eq(["desktop", "desktop", "mobile", "mobile"])
     end
+  end
 
+  describe ".clean_up" do
+    it "removes items older than threshold" do
+      StylesheetCache.destroy_all
+
+      StylesheetCache.add("a", "b", "c", "map")
+      StylesheetCache.add("d", "e", "f", "map")
+
+      above_threshold = StylesheetCache::CLEANUP_AFTER_DAYS - 1
+      StylesheetCache.first.update!(created_at: above_threshold.days.ago)
+
+      StylesheetCache.clean_up
+      expect(StylesheetCache.all.size).to eq(2)
+
+      below_threshold = StylesheetCache::CLEANUP_AFTER_DAYS + 1
+      StylesheetCache.first.update!(created_at: below_threshold.days.ago)
+
+      StylesheetCache.clean_up
+      expect(StylesheetCache.all.size).to eq(1)
+    end
   end
 end

From 438a7629561397830fa9622f517ecec46e003e82 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Fri, 16 Jul 2021 11:08:20 -0400
Subject: [PATCH 11/77] FEATURE: Add assistant to quick search widget (#13650)

Replaces the autocomplete overlay for categories and usernames on the search input and adds suggestions as items in the search results instead. Also adds the same behaviour for @mentions as well as special `in: status: order:` keywords. See PR for more details.
---
 .../discourse/app/components/site-header.js   |   1 -
 .../discourse/app/lib/plugin-api.js           |  15 +-
 .../javascripts/discourse/app/lib/search.js   |  61 ++-----
 .../discourse/app/widgets/header.js           |  15 +-
 .../app/widgets/search-menu-controls.js       |  12 +-
 .../app/widgets/search-menu-results.js        | 166 ++++++++++++++++++
 .../discourse/app/widgets/search-menu.js      |  97 +++++++++-
 .../discourse/tests/acceptance/search-test.js |  55 ++++++
 .../stylesheets/common/base/search-menu.scss  |  17 ++
 9 files changed, 370 insertions(+), 69 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/site-header.js b/app/assets/javascripts/discourse/app/components/site-header.js
index d9895801fa..9ac49c9cfe 100644
--- a/app/assets/javascripts/discourse/app/components/site-header.js
+++ b/app/assets/javascripts/discourse/app/components/site-header.js
@@ -218,7 +218,6 @@ const SiteHeaderComponent = MountWidget.extend(
 
       this.dispatch("notifications:changed", "user-notifications");
       this.dispatch("header:keyboard-trigger", "header");
-      this.dispatch("search-autocomplete:after-complete", "search-term");
       this.dispatch("user-menu:navigation", "user-menu");
 
       this.appEvents.on("dom:clean", this, "_cleanDom");
diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js
index 994d45dfbd..cbf157d6cb 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js
@@ -73,9 +73,10 @@ import { replaceFormatter } from "discourse/lib/utilities";
 import { replaceTagRenderer } from "discourse/lib/render-tag";
 import { setNewCategoryDefaultColors } from "discourse/routes/new-category";
 import { addSearchResultsCallback } from "discourse/lib/search";
+import { addInSearchShortcut } from "discourse/widgets/search-menu-results";
 
 // If you add any methods to the API ensure you bump up this number
-const PLUGIN_API_VERSION = "0.11.5";
+const PLUGIN_API_VERSION = "0.11.6";
 
 class PluginApi {
   constructor(version, container) {
@@ -1295,6 +1296,18 @@ class PluginApi {
   addSearchResultsCallback(callback) {
     addSearchResultsCallback(callback);
   }
+
+  /**
+   * Add a in: shortcut to search menu panel.
+   *
+   * ```
+   * addInSearchShortcut("in:assigned");
+   * ```
+   *
+   */
+  addInSearchShortcut(value) {
+    addInSearchShortcut(value);
+  }
 }
 
 // from http://stackoverflow.com/questions/6832596/how-to-compare-software-version-number-using-js-only-number
diff --git a/app/assets/javascripts/discourse/app/lib/search.js b/app/assets/javascripts/discourse/app/lib/search.js
index b2de359e91..a53769b512 100644
--- a/app/assets/javascripts/discourse/app/lib/search.js
+++ b/app/assets/javascripts/discourse/app/lib/search.js
@@ -206,53 +206,30 @@ export function isValidSearchTerm(searchTerm, siteSettings) {
   }
 }
 
-export function applySearchAutocomplete(
-  $input,
-  siteSettings,
-  appEvents,
-  options
-) {
-  const afterComplete = function () {
-    if (appEvents) {
-      appEvents.trigger("search-autocomplete:after-complete");
-    }
-  };
-
+export function applySearchAutocomplete($input, siteSettings) {
   $input.autocomplete(
-    deepMerge(
-      {
-        template: findRawTemplate("category-tag-autocomplete"),
-        key: "#",
-        width: "100%",
-        treatAsTextarea: true,
-        autoSelectFirstSuggestion: false,
-        transformComplete(obj) {
-          return obj.text;
-        },
-        dataSource(term) {
-          return searchCategoryTag(term, siteSettings);
-        },
-        afterComplete,
-      },
-      options
-    )
+    deepMerge({
+      template: findRawTemplate("category-tag-autocomplete"),
+      key: "#",
+      width: "100%",
+      treatAsTextarea: true,
+      autoSelectFirstSuggestion: false,
+      transformComplete: (obj) => obj.text,
+      dataSource: (term) => searchCategoryTag(term, siteSettings),
+    })
   );
 
   if (siteSettings.enable_mentions) {
     $input.autocomplete(
-      deepMerge(
-        {
-          template: findRawTemplate("user-selector-autocomplete"),
-          key: "@",
-          width: "100%",
-          treatAsTextarea: true,
-          autoSelectFirstSuggestion: false,
-          transformComplete: (v) => v.username || v.name,
-          dataSource: (term) => userSearch({ term, includeGroups: true }),
-          afterComplete,
-        },
-        options
-      )
+      deepMerge({
+        template: findRawTemplate("user-selector-autocomplete"),
+        key: "@",
+        width: "100%",
+        treatAsTextarea: true,
+        autoSelectFirstSuggestion: false,
+        transformComplete: (v) => v.username || v.name,
+        dataSource: (term) => userSearch({ term, includeGroups: true }),
+      })
     );
   }
 }
diff --git a/app/assets/javascripts/discourse/app/widgets/header.js b/app/assets/javascripts/discourse/app/widgets/header.js
index 784d5265db..0c292dea95 100644
--- a/app/assets/javascripts/discourse/app/widgets/header.js
+++ b/app/assets/javascripts/discourse/app/widgets/header.js
@@ -2,7 +2,6 @@ import DiscourseURL, { userPath } from "discourse/lib/url";
 import I18n from "I18n";
 import { addExtraUserClasses } from "discourse/helpers/user-avatar";
 import { ajax } from "discourse/lib/ajax";
-import { applySearchAutocomplete } from "discourse/lib/search";
 import { avatarImg } from "discourse/widgets/post";
 import { createWidget } from "discourse/widgets/widget";
 import { get } from "@ember/object";
@@ -484,17 +483,9 @@ export default createWidget("header", {
 
     if (this.state.searchVisible) {
       schedule("afterRender", () => {
-        const $searchInput = $("#search-term");
-        $searchInput.focus().select();
-
-        applySearchAutocomplete(
-          $searchInput,
-          this.siteSettings,
-          this.appEvents,
-          {
-            appendSelector: ".menu-panel",
-          }
-        );
+        const searchInput = document.querySelector("#search-term");
+        searchInput.focus();
+        searchInput.select();
       });
     }
   },
diff --git a/app/assets/javascripts/discourse/app/widgets/search-menu-controls.js b/app/assets/javascripts/discourse/app/widgets/search-menu-controls.js
index dd2f485467..dc329df3e2 100644
--- a/app/assets/javascripts/discourse/app/widgets/search-menu-controls.js
+++ b/app/assets/javascripts/discourse/app/widgets/search-menu-controls.js
@@ -13,10 +13,6 @@ createWidget("search-term", {
     return { afterAutocomplete: false };
   },
 
-  searchAutocompleteAfterComplete() {
-    this.state.afterAutocomplete = true;
-  },
-
   buildAttributes(attrs) {
     return {
       type: "text",
@@ -28,12 +24,8 @@ createWidget("search-term", {
   },
 
   keyUp(e) {
-    if (e.which === 13) {
-      if (this.state.afterAutocomplete) {
-        this.state.afterAutocomplete = false;
-      } else {
-        return this.sendWidgetAction("fullSearch");
-      }
+    if (e.which === 13 && !this.state.afterAutocomplete) {
+      return this.sendWidgetAction("fullSearch");
     }
 
     const val = this.attrs.value;
diff --git a/app/assets/javascripts/discourse/app/widgets/search-menu-results.js b/app/assets/javascripts/discourse/app/widgets/search-menu-results.js
index 3a5885d947..5ef9d058c1 100644
--- a/app/assets/javascripts/discourse/app/widgets/search-menu-results.js
+++ b/app/assets/javascripts/discourse/app/widgets/search-menu-results.js
@@ -10,6 +10,33 @@ import highlightSearch from "discourse/lib/highlight-search";
 import { iconNode } from "discourse-common/lib/icon-library";
 import renderTag from "discourse/lib/render-tag";
 
+const inSearchShortcuts = [
+  "in:title",
+  "in:personal",
+  "in:seen",
+  "in:likes",
+  "in:bookmarks",
+  "in:created",
+];
+const statusSearchShortcuts = [
+  "status:open",
+  "status:closed",
+  "status:public",
+  "status:noreplies",
+];
+const orderSearchShortcuts = [
+  "order:latest",
+  "order:views",
+  "order:likes",
+  "order:latest_topic",
+];
+
+export function addInSearchShortcut(value) {
+  if (inSearchShortcuts.indexOf(value) === -1) {
+    inSearchShortcuts.push(value);
+  }
+}
+
 class Highlighted extends RawHtml {
   constructor(html, term) {
     super({ html: `<span>${html}</span>` });
@@ -207,6 +234,14 @@ createWidget("search-menu-results", {
   tagName: "div.results",
 
   html(attrs) {
+    if (attrs.suggestionKeyword) {
+      return this.attach("search-menu-assistant", {
+        fullTerm: attrs.term,
+        suggestionKeyword: attrs.suggestionKeyword,
+        results: attrs.suggestionResults || [],
+      });
+    }
+
     if (attrs.invalidTerm) {
       return h("div.no-results", I18n.t("search.too_short"));
     }
@@ -320,3 +355,134 @@ createWidget("search-menu-results", {
     return content;
   },
 });
+
+createWidget("search-menu-assistant", {
+  tagName: "ul.search-menu-assistant",
+
+  html(attrs) {
+    if (this.siteSettings.tagging_enabled) {
+      addInSearchShortcut("in:tagged");
+    }
+
+    const content = [];
+    const { fullTerm, suggestionKeyword } = attrs;
+    const prefix = fullTerm.split(suggestionKeyword)[0].trim() || null;
+
+    switch (suggestionKeyword) {
+      case "#":
+        attrs.results.map((category) => {
+          const slug = prefix
+            ? `${prefix} #${category.slug} `
+            : `#${category.slug} `;
+
+          content.push(
+            this.attach("search-menu-assistant-item", {
+              prefix: prefix,
+              category,
+              slug,
+            })
+          );
+        });
+        break;
+      case "@":
+        attrs.results.map((user) => {
+          const slug = prefix
+            ? `${prefix} @${user.username} `
+            : `@${user.username} `;
+
+          content.push(
+            this.attach("search-menu-assistant-item", {
+              prefix: prefix,
+              user,
+              slug,
+            })
+          );
+        });
+        break;
+      case "in:":
+        inSearchShortcuts.map((item) => {
+          const slug = prefix ? `${prefix} ${item} ` : item;
+          content.push(this.attach("search-menu-assistant-item", { slug }));
+        });
+        break;
+      case "status:":
+        statusSearchShortcuts.map((item) => {
+          const slug = prefix ? `${prefix} ${item} ` : item;
+          content.push(this.attach("search-menu-assistant-item", { slug }));
+        });
+        break;
+      case "order:":
+        orderSearchShortcuts.map((item) => {
+          const slug = prefix ? `${prefix} ${item} ` : item;
+          content.push(this.attach("search-menu-assistant-item", { slug }));
+        });
+        break;
+    }
+
+    return content;
+  },
+});
+
+createWidget("search-menu-assistant-item", {
+  tagName: "li.search-menu-assistant-item",
+
+  html(attrs) {
+    if (attrs.category) {
+      return h(
+        "a.widget-link.search-link",
+        {
+          attributes: {
+            href: attrs.category.url,
+          },
+        },
+        [
+          h("span.search-item-prefix", attrs.prefix),
+          this.attach("category-link", {
+            category: attrs.category,
+            allowUncategorized: true,
+          }),
+        ]
+      );
+    } else if (attrs.user) {
+      const userResult = [
+        avatarImg("small", {
+          template: attrs.user.avatar_template,
+          username: attrs.user.username,
+        }),
+        h("span.username", formatUsername(attrs.user.username)),
+      ];
+
+      return h(
+        "a.widget-link.search-link",
+        {
+          attributes: {
+            href: "#",
+          },
+        },
+        [
+          h("span.search-item-prefix", attrs.prefix),
+          h("span.search-item-user", userResult),
+        ]
+      );
+    } else {
+      return h(
+        "a.widget-link.search-link",
+        {
+          attributes: {
+            href: "#",
+          },
+        },
+        h("span.search-item-slug", attrs.slug)
+      );
+    }
+  },
+
+  click(e) {
+    const searchInput = document.querySelector("#search-term");
+    searchInput.value = this.attrs.slug;
+    searchInput.focus();
+    this.sendWidgetAction("triggerAutocomplete", this.attrs.slug);
+    e.preventDefault();
+    return false;
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/widgets/search-menu.js b/app/assets/javascripts/discourse/app/widgets/search-menu.js
index 246aeb4626..6514e9a1d4 100644
--- a/app/assets/javascripts/discourse/app/widgets/search-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/search-menu.js
@@ -1,4 +1,5 @@
 import { isValidSearchTerm, searchForTerm } from "discourse/lib/search";
+import Category from "discourse/models/category";
 import DiscourseURL from "discourse/lib/url";
 import { createWidget } from "discourse/widgets/widget";
 import discourseDebounce from "discourse-common/lib/debounce";
@@ -6,8 +7,15 @@ import { get } from "@ember/object";
 import getURL from "discourse-common/lib/get-url";
 import { h } from "virtual-dom";
 import { popupAjaxError } from "discourse/lib/ajax-error";
+import userSearch from "discourse/lib/user-search";
+
+const CATEGORY_SLUG_REGEXP = /(\#[a-zA-Z0-9\-:]*)$/gi;
+// The backend user search query returns zero results for a term-free search
+// so the regexp below only matches @ followed by a valid character
+const USERNAME_REGEXP = /(\@[a-zA-Z0-9\-\_]+)$/gi;
 
 const searchData = {};
+const suggestionTriggers = ["in:", "status:", "order:"];
 
 export function initSearchData() {
   searchData.loading = false;
@@ -17,6 +25,7 @@ export function initSearchData() {
   searchData.typeFilter = null;
   searchData.invalidTerm = false;
   searchData.topicId = null;
+  searchData.afterAutocomplete = false;
 }
 
 initSearchData();
@@ -39,6 +48,49 @@ const SearchHelper = {
     const { term, typeFilter, contextEnabled } = searchData;
     const searchContext = contextEnabled ? widget.searchContext() : null;
     const fullSearchUrl = widget.fullSearchUrl();
+    const matchSuggestions = this.matchesSuggestions();
+
+    if (matchSuggestions) {
+      searchData.noResults = true;
+      searchData.results = [];
+      searchData.loading = false;
+
+      if (typeof matchSuggestions === "string") {
+        searchData.suggestionKeyword = matchSuggestions;
+        widget.scheduleRerender();
+        return;
+      } else {
+        if (matchSuggestions.type === "category") {
+          const categorySearchTerm = matchSuggestions.categoriesMatch[0].replace(
+            "#",
+            ""
+          );
+
+          searchData.suggestionResults = Category.search(categorySearchTerm);
+          searchData.suggestionKeyword = "#";
+          widget.scheduleRerender();
+          return;
+        }
+        if (matchSuggestions.type === "username") {
+          userSearch({
+            term: matchSuggestions.usernamesMatch[0],
+            includeGroups: true,
+          }).then((result) => {
+            if (result?.users.length > 0) {
+              searchData.suggestionResults = result.users;
+              searchData.suggestionKeyword = "@";
+            } else {
+              searchData.noResults = true;
+              searchData.suggestionKeyword = false;
+            }
+            widget.scheduleRerender();
+          });
+          return;
+        }
+      }
+    }
+
+    searchData.suggestionKeyword = false;
 
     if (!isValidSearchTerm(term, widget.siteSettings)) {
       searchData.noResults = true;
@@ -73,10 +125,38 @@ const SearchHelper = {
         .catch(popupAjaxError)
         .finally(() => {
           searchData.loading = false;
+          searchData.afterAutocomplete = false;
           widget.scheduleRerender();
         });
     }
   },
+
+  matchesSuggestions() {
+    if (searchData.term === undefined) {
+      return false;
+    }
+
+    const simpleSuggestion = suggestionTriggers.find(
+      (mod) => searchData.term === mod || searchData.term.endsWith(` ${mod}`)
+    );
+
+    if (simpleSuggestion) {
+      return simpleSuggestion;
+    }
+
+    const categoriesMatch = searchData.term.match(CATEGORY_SLUG_REGEXP);
+
+    if (categoriesMatch) {
+      return { type: "category", categoriesMatch };
+    }
+
+    const usernamesMatch = searchData.term.match(USERNAME_REGEXP);
+    if (usernamesMatch) {
+      return { type: "username", usernamesMatch };
+    }
+
+    return false;
+  },
 };
 
 export default createWidget("search-menu", {
@@ -132,10 +212,14 @@ export default createWidget("search-menu", {
   },
 
   panelContents() {
-    const contextEnabled = searchData.contextEnabled;
+    const { contextEnabled, afterAutocomplete } = searchData;
 
     let searchInput = [
-      this.attach("search-term", { value: searchData.term, contextEnabled }),
+      this.attach(
+        "search-term",
+        { value: searchData.term, contextEnabled },
+        { state: { afterAutocomplete } }
+      ),
     ];
     if (searchData.term && searchData.loading) {
       searchInput.push(h("div.searching", h("div.spinner")));
@@ -157,6 +241,8 @@ export default createWidget("search-menu", {
           results: searchData.results,
           invalidTerm: searchData.invalidTerm,
           searchContextEnabled: searchData.contextEnabled,
+          suggestionKeyword: searchData.suggestionKeyword,
+          suggestionResults: searchData.suggestionResults,
         })
       );
     }
@@ -211,7 +297,7 @@ export default createWidget("search-menu", {
       return false;
     }
 
-    if (searchData.loading || searchData.noResults) {
+    if (searchData.loading) {
       return;
     }
 
@@ -306,6 +392,11 @@ export default createWidget("search-menu", {
     this.triggerSearch();
   },
 
+  triggerAutocomplete(term) {
+    searchData.afterAutocomplete = true;
+    this.searchTermChanged(term);
+  },
+
   fullSearch() {
     if (!isValidSearchTerm(searchData.term, this.siteSettings)) {
       return;
diff --git a/app/assets/javascripts/discourse/tests/acceptance/search-test.js b/app/assets/javascripts/discourse/tests/acceptance/search-test.js
index c759a1aa3d..a61257e3c3 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/search-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/search-test.js
@@ -2,6 +2,7 @@ import {
   acceptance,
   count,
   exists,
+  query,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
 import { click, fillIn, triggerKeyEvent, visit } from "@ember/test-helpers";
@@ -247,3 +248,57 @@ acceptance("Search - with tagging enabled", function (needs) {
     assert.equal(tags, "dev slow");
   });
 });
+
+acceptance("Search - assistant", function (needs) {
+  needs.user();
+
+  test("shows category shortcuts when typing #", async function (assert) {
+    await visit("/");
+
+    await click("#search-button");
+
+    await fillIn("#search-term", "#");
+    await triggerKeyEvent("#search-term", "keyup", 51);
+
+    const firstCategory =
+      ".search-menu .results ul.search-menu-assistant .search-link";
+    assert.ok(exists(query(firstCategory)));
+
+    const firstResultSlug = query(
+      `${firstCategory} .category-name`
+    ).innerText.trim();
+
+    await click(firstCategory);
+    assert.equal(query("#search-term").value, `#${firstResultSlug} `);
+
+    await fillIn("#search-term", "sam #");
+    await triggerKeyEvent("#search-term", "keyup", 51);
+
+    assert.ok(exists(query(firstCategory)));
+    assert.equal(
+      query(
+        ".search-menu .results ul.search-menu-assistant .search-item-prefix"
+      ).innerText,
+      "sam"
+    );
+
+    await click(firstCategory);
+    assert.equal(query("#search-term").value, `sam #${firstResultSlug} `);
+  });
+
+  test("shows in: shortcuts", async function (assert) {
+    await visit("/");
+    await click("#search-button");
+
+    const firstTarget =
+      ".search-menu .results ul.search-menu-assistant .search-link .search-item-slug";
+
+    await fillIn("#search-term", "in:");
+    await triggerKeyEvent("#search-term", "keyup", 51);
+    assert.equal(query(firstTarget).innerText, "in:title");
+
+    await fillIn("#search-term", "sam in:");
+    await triggerKeyEvent("#search-term", "keyup", 51);
+    assert.equal(query(firstTarget).innerText, "sam in:title");
+  });
+});
diff --git a/app/assets/stylesheets/common/base/search-menu.scss b/app/assets/stylesheets/common/base/search-menu.scss
index 883318421a..b6c6926f22 100644
--- a/app/assets/stylesheets/common/base/search-menu.scss
+++ b/app/assets/stylesheets/common/base/search-menu.scss
@@ -251,6 +251,23 @@
         }
       }
     }
+
+    .search-menu-assistant {
+      min-width: 100%;
+      margin-top: -1em;
+
+      .search-menu-assistant-item {
+        > span {
+          vertical-align: baseline;
+          display: inline-block;
+        }
+      }
+
+      .search-item-user .avatar,
+      .search-item-prefix {
+        margin-right: 0.5em;
+      }
+    }
   }
 
   .searching {

From 50b3d7708e6af60e7d08fb147c0da67b1337131e Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 16 Jul 2021 15:16:06 +0100
Subject: [PATCH 12/77] DEV: Update discourse_connect_overrides_ setting copy

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

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 3ac856726c..1ae9ed99e9 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1699,11 +1699,11 @@ en:
     auth_overrides_email: "Overrides local email with external site email on every login, and prevent local changes. Applies to all authentication providers. (WARNING: discrepancies can occur due to normalization of local emails)"
     auth_overrides_username: "Overrides local username with external site username on every login, and prevent local changes.  Applies to all authentication providers. (WARNING: discrepancies can occur due to differences in username length/requirements)"
     auth_overrides_name: "Overrides local full name with external site full name on every login, and prevent local changes.  Applies to all authentication providers."
-    discourse_connect_overrides_avatar: "Overrides user avatar with external site avatar from DiscourseConnect payload. If enabled, users will not be allowed to upload avatars on Discourse."
-    discourse_connect_overrides_location: "Overrides user location with external location from DiscourseConnect payload and prevent local changes."
-    discourse_connect_overrides_website: "Overrides user website with external location from DiscourseConnect payload and prevent local changes."
-    discourse_connect_overrides_profile_background: "Overrides user profile background with external site avatar from DiscourseConnect payload."
-    discourse_connect_overrides_card_background: "Overrides user card background with external site avatar from DiscourseConnect payload."
+    discourse_connect_overrides_avatar: "Overrides user avatar with value from DiscourseConnect payload. If enabled, users will not be allowed to upload avatars on Discourse."
+    discourse_connect_overrides_location: "Overrides user location with value from DiscourseConnect payload and prevent local changes."
+    discourse_connect_overrides_website: "Overrides user website with value from DiscourseConnect payload and prevent local changes."
+    discourse_connect_overrides_profile_background: "Overrides user profile background with value from DiscourseConnect payload."
+    discourse_connect_overrides_card_background: "Overrides user card background with value from DiscourseConnect payload."
     discourse_connect_not_approved_url: "Redirect unapproved DiscourseConnect accounts to this URL"
     discourse_connect_allows_all_return_paths: "Do not restrict the domain for return_paths provided by DiscourseConnect (by default return path must be on current site)"
 

From 422fa1b1d864c9664c6400f327b139d2e628f30c Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 16 Jul 2021 15:16:30 +0100
Subject: [PATCH 13/77] FIX: Use correct setting for DiscourseConnect card
 background overrides

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

diff --git a/app/models/discourse_single_sign_on.rb b/app/models/discourse_single_sign_on.rb
index 4abfc61a4a..7be3b50537 100644
--- a/app/models/discourse_single_sign_on.rb
+++ b/app/models/discourse_single_sign_on.rb
@@ -342,7 +342,7 @@ class DiscourseSingleSignOn < SingleSignOn
 
     if card_background_url.present?
       card_background_missing = user.user_profile.card_background_upload.blank? || Upload.get_from_url(user.user_profile.card_background_upload.url).blank?
-      if card_background_missing || SiteSetting.discourse_connect_overrides_profile_background
+      if card_background_missing || SiteSetting.discourse_connect_overrides_card_background
         card_background_changed = sso_record.external_card_background_url != card_background_url
         if card_background_changed || card_background_missing
           Jobs.enqueue(:download_profile_background_from_url,

From 9b15affaae020f084271b4e74eaba5a02b53ed6c Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Fri, 16 Jul 2021 11:10:35 -0500
Subject: [PATCH 14/77] DEV: Plugin outlet in topic-status component (#13763)

---
 .../javascripts/discourse/app/components/topic-status.js       | 3 +--
 .../discourse/app/templates/components/topic-status.hbs        | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/topic-status.js b/app/assets/javascripts/discourse/app/components/topic-status.js
index a370849c8c..0cea69125b 100644
--- a/app/assets/javascripts/discourse/app/components/topic-status.js
+++ b/app/assets/javascripts/discourse/app/components/topic-status.js
@@ -11,9 +11,8 @@ export default Component.extend({
     if (this.canAct && $(e.target).hasClass("d-icon-thumbtack")) {
       const topic = this.topic;
       topic.get("pinned") ? topic.clearPin() : topic.rePin();
+      return false;
     }
-
-    return false;
   },
 
   @discourseComputed("disableActions")
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-status.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-status.hbs
index 23761e150f..1852bcbf40 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-status.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/topic-status.hbs
@@ -30,3 +30,4 @@
 {{~#if topicInvisible~}}
   <span title={{invisibleTitle}} class="topic-status">{{invisibleIcon}}</span>
 {{~/if~}}
+{{plugin-outlet name="after-topic-status" tagName="" args=(hash topic=topic)}}

From 079d2af55fbb45b34b1c8ed5b82061d525266b17 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Fri, 16 Jul 2021 19:57:12 +0300
Subject: [PATCH 15/77] FIX: Clear stale status of reloaded reviewables
 (#13750)

* FIX: Clear stale status of reloaded reviewables

Navigating away from and back to the reviewables reloaded Reviewable
records, but did not clear the "stale" attribute.

* FEATURE: Show user who last acted on reviewable

When a user acts on a reviewable, all other clients are notified and a
generic "reviewable was resolved by someone" notice was shown instead of
the buttons. There is no need to keep secret the username of the acting
user.
---
 .../discourse/app/components/reviewable-item.js           | 6 +++---
 .../javascripts/discourse/app/routes/review-index.js      | 3 ++-
 .../app/templates/components/reviewable-item.hbs          | 4 ++--
 .../javascripts/discourse/tests/acceptance/review-test.js | 8 +++++++-
 app/jobs/regular/notify_reviewable.rb                     | 5 ++++-
 app/models/reviewable.rb                                  | 3 ++-
 config/locales/client.en.yml                              | 2 +-
 7 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/reviewable-item.js b/app/assets/javascripts/discourse/app/components/reviewable-item.js
index 23071cac96..d7173eb3ec 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-item.js
+++ b/app/assets/javascripts/discourse/app/components/reviewable-item.js
@@ -29,14 +29,14 @@ export default Component.extend({
 
   @discourseComputed(
     "reviewable.type",
-    "reviewable.stale",
+    "reviewable.last_performing_username",
     "siteSettings.blur_tl0_flagged_posts_media",
     "reviewable.target_created_by_trust_level"
   )
-  customClasses(type, stale, blurEnabled, trustLevel) {
+  customClasses(type, lastPerformingUsername, blurEnabled, trustLevel) {
     let classes = type.dasherize();
 
-    if (stale) {
+    if (lastPerformingUsername) {
       classes = `${classes} reviewable-stale`;
     }
 
diff --git a/app/assets/javascripts/discourse/app/routes/review-index.js b/app/assets/javascripts/discourse/app/routes/review-index.js
index 187c91c953..a19b0f9952 100644
--- a/app/assets/javascripts/discourse/app/routes/review-index.js
+++ b/app/assets/javascripts/discourse/app/routes/review-index.js
@@ -39,6 +39,8 @@ export default DiscourseRoute.extend({
       sort_order: meta.sort_order,
       additionalFilters: meta.additional_filters || {},
     });
+
+    controller.reviewables.setEach("last_performing_username", null);
   },
 
   activate() {
@@ -62,7 +64,6 @@ export default DiscourseRoute.extend({
           const updates = data.updates[reviewable.id];
           if (updates) {
             reviewable.setProperties(updates);
-            reviewable.set("stale", true);
           }
         });
       }
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs
index 9288db16d2..df7a072379 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs
@@ -44,8 +44,8 @@
     {{/if}}
   </div>
   <div class="reviewable-actions">
-    {{#if reviewable.stale}}
-      <div class="stale-help">{{i18n "review.stale_help"}}</div>
+    {{#if reviewable.last_performing_username}}
+      <div class="stale-help">{{html-safe (i18n "review.stale_help" username=reviewable.last_performing_username)}}</div>
     {{else}}
       {{#if claimEnabled}}
         <div class="claimed-actions">
diff --git a/app/assets/javascripts/discourse/tests/acceptance/review-test.js b/app/assets/javascripts/discourse/tests/acceptance/review-test.js
index 522fe2c189..23c7b64c13 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/review-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/review-test.js
@@ -197,7 +197,7 @@ acceptance("Review", function (needs) {
     publishToMessageBus("/reviewable_counts", {
       review_count: 1,
       updates: {
-        1234: { status: 1 },
+        1234: { last_performing_username: "foo", status: 1 },
       },
     });
 
@@ -206,5 +206,11 @@ acceptance("Review", function (needs) {
     assert.ok(reviewable.className.includes("reviewable-stale"));
     assert.equal(count("[data-reviewable-id=1234] .status .approved"), 1);
     assert.equal(count(".stale-help"), 1);
+    assert.ok(query(".stale-help").innerText.includes("foo"));
+
+    await visit("/");
+    await visit("/review"); // reload review
+
+    assert.equal(count(".stale-help"), 0);
   });
 });
diff --git a/app/jobs/regular/notify_reviewable.rb b/app/jobs/regular/notify_reviewable.rb
index 3205129333..9c3e729fe2 100644
--- a/app/jobs/regular/notify_reviewable.rb
+++ b/app/jobs/regular/notify_reviewable.rb
@@ -19,7 +19,10 @@ class Jobs::NotifyReviewable < ::Jobs::Base
 
     if args[:updated_reviewable_ids].present?
       Reviewable.where(id: args[:updated_reviewable_ids]).each do |r|
-        payload = { status: r.status }
+        payload = {
+          last_performing_username: args[:performing_username],
+          status: r.status
+        }
 
         all_updates[:admins][r.id] = payload
         all_updates[:moderators][r.id] = payload if r.reviewable_by_moderator?
diff --git a/app/models/reviewable.rb b/app/models/reviewable.rb
index e8998a1d14..bff1c63064 100644
--- a/app/models/reviewable.rb
+++ b/app/models/reviewable.rb
@@ -371,7 +371,8 @@ class Reviewable < ActiveRecord::Base
       Jobs.enqueue(
         :notify_reviewable,
         reviewable_id: self.id,
-        updated_reviewable_ids: result.remove_reviewable_ids,
+        performing_username: performed_by.username,
+        updated_reviewable_ids: result.remove_reviewable_ids
       )
     end
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 81484815c4..96af2e71dd 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -426,7 +426,7 @@ en:
         type_bonus:
           name: "type bonus"
           title: "Certain reviewable types can be assigned a bonus by staff to make them a higher priority."
-      stale_help: "This reviewable has been resolved by someone else."
+      stale_help: "This reviewable has been resolved by <b>%{username}</b>."
       claim_help:
         optional: "You can claim this item to prevent others from reviewing it."
         required: "You must claim items before you can review them."

From 366238bb81145f846c2e913a33a526fadd417a04 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Fri, 16 Jul 2021 14:19:59 -0300
Subject: [PATCH 16/77] FIX: Disable the post submit button during image
 processing properly (#13765)

There was a UI bug when submitting multiple files in the same batch. We
would remove the disabled status of the submit button after the previous
file was sucesfully uploaded and the next one was still mid
optimization.

Reported at https://meta.discourse.org/t/-/194841/15?u=falco
---
 .../discourse/app/components/composer-editor.js | 17 ++++++++++-------
 .../discourse/app/controllers/composer.js       |  2 +-
 .../discourse/app/templates/composer.hbs        |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/composer-editor.js b/app/assets/javascripts/discourse/app/components/composer-editor.js
index ae3addd81a..ce73e3b597 100644
--- a/app/assets/javascripts/discourse/app/components/composer-editor.js
+++ b/app/assets/javascripts/discourse/app/components/composer-editor.js
@@ -652,7 +652,6 @@ export default Component.extend({
         this.setProperties({
           uploadProgress: 0,
           isUploading: false,
-          isProcessingUpload: false,
           isCancellable: false,
         });
       }
@@ -683,6 +682,14 @@ export default Component.extend({
     });
 
     $element
+      .on("fileuploadprocessstart", () => {
+        this.setProperties({
+          uploadProgress: 0,
+          isUploading: true,
+          isProcessingUpload: true,
+          isCancellable: false,
+        });
+      })
       .on("fileuploadprocess", (e, data) => {
         this.appEvents.trigger(
           "composer:insert-text",
@@ -690,12 +697,6 @@ export default Component.extend({
             filename: data.files[data.index].name,
           })}]()\n`
         );
-        this.setProperties({
-          uploadProgress: 0,
-          isUploading: true,
-          isProcessingUpload: true,
-          isCancellable: false,
-        });
       })
       .on("fileuploadprocessalways", (e, data) => {
         this.appEvents.trigger(
@@ -705,6 +706,8 @@ export default Component.extend({
           })}]()\n`,
           ""
         );
+      })
+      .on("fileuploadprocessstop", () => {
         this.setProperties({
           uploadProgress: 0,
           isUploading: false,
diff --git a/app/assets/javascripts/discourse/app/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js
index 9443a74907..e9fa6a2c80 100644
--- a/app/assets/javascripts/discourse/app/controllers/composer.js
+++ b/app/assets/javascripts/discourse/app/controllers/composer.js
@@ -663,7 +663,7 @@ export default Controller.extend({
     },
   },
 
-  disableSubmit: or("model.loading", "isUploading"),
+  disableSubmit: or("model.loading", "isUploading", "isProcessingUpload"),
 
   save(force, options = {}) {
     if (this.disableSubmit) {
diff --git a/app/assets/javascripts/discourse/app/templates/composer.hbs b/app/assets/javascripts/discourse/app/templates/composer.hbs
index 6cca5bcf1e..b74974e784 100644
--- a/app/assets/javascripts/discourse/app/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer.hbs
@@ -167,7 +167,7 @@
               {{/if}}
             {{/if}}
 
-            {{#if isUploading}}
+            {{#if (or isUploading isProcessingUpload)}}
               <div id="file-uploading">
                 {{#if isProcessingUpload}}
                   {{loading-spinner size="small"}}<span>{{i18n "upload_selector.processing"}}</span>

From 27b97e4f648da1587e97c5f661da145e12a27bea Mon Sep 17 00:00:00 2001
From: Andrei Prigorshnev <a.prigorshnev@gmail.com>
Date: Fri, 16 Jul 2021 21:50:50 +0400
Subject: [PATCH 17/77] DEV: add pick-files-button component (#13764)

* DEV: add pick-files-button component
* Scope querySelector to the component, add removeEventListener, fix formatting
---
 .../app/components/pick-files-button.js       | 106 ++++++++++++++++++
 .../components/pick-files-button.hbs          |   6 +
 .../components/pick-files-button-tests.js     |  78 +++++++++++++
 .../stylesheets/common/components/_index.scss |   1 +
 .../common/components/pick-files-button.scss  |   5 +
 config/locales/client.en.yml                  |   3 +
 6 files changed, 199 insertions(+)
 create mode 100644 app/assets/javascripts/discourse/app/components/pick-files-button.js
 create mode 100644 app/assets/javascripts/discourse/app/templates/components/pick-files-button.hbs
 create mode 100644 app/assets/javascripts/discourse/tests/integration/components/pick-files-button-tests.js
 create mode 100644 app/assets/stylesheets/common/components/pick-files-button.scss

diff --git a/app/assets/javascripts/discourse/app/components/pick-files-button.js b/app/assets/javascripts/discourse/app/components/pick-files-button.js
new file mode 100644
index 0000000000..b4752881d2
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/pick-files-button.js
@@ -0,0 +1,106 @@
+import Component from "@ember/component";
+import { action } from "@ember/object";
+import { empty } from "@ember/object/computed";
+import { bind, default as computed } from "discourse-common/utils/decorators";
+import I18n from "I18n";
+
+export default Component.extend({
+  classNames: ["pick-files-button"],
+  acceptedFileTypes: null,
+  acceptAnyFile: empty("acceptedFileTypes"),
+
+  didInsertElement() {
+    this._super(...arguments);
+    const fileInput = this.element.querySelector("input");
+    this.set("fileInput", fileInput);
+    fileInput.addEventListener("change", this.onChange, false);
+  },
+
+  willDestroyElement() {
+    this._super(...arguments);
+    this.fileInput.removeEventListener("change", this.onChange);
+  },
+
+  @bind
+  onChange() {
+    const files = this.fileInput.files;
+    this._filesPicked(files);
+  },
+
+  @computed
+  acceptedFileTypesString() {
+    if (!this.acceptedFileTypes) {
+      return null;
+    }
+
+    return this.acceptedFileTypes.join(",");
+  },
+
+  @computed
+  acceptedExtensions() {
+    if (!this.acceptedFileTypes) {
+      return null;
+    }
+
+    return this.acceptedFileTypes
+      .filter((type) => type.startsWith("."))
+      .map((type) => type.substring(1));
+  },
+
+  @computed
+  acceptedMimeTypes() {
+    if (!this.acceptedFileTypes) {
+      return null;
+    }
+
+    return this.acceptedFileTypes.filter((type) => !type.startsWith("."));
+  },
+
+  @action
+  openSystemFilePicker() {
+    this.fileInput.click();
+  },
+
+  _filesPicked(files) {
+    if (!files || !files.length) {
+      return;
+    }
+
+    if (!this._haveAcceptedTypes(files)) {
+      const message = I18n.t("pick_files_button.unsupported_file_picked", {
+        types: this.acceptedFileTypesString,
+      });
+      bootbox.alert(message);
+      return;
+    }
+    this.onFilesPicked(files);
+  },
+
+  _haveAcceptedTypes(files) {
+    for (const file of files) {
+      if (
+        !(this._hasAcceptedExtension(file) && this._hasAcceptedMimeType(file))
+      ) {
+        return false;
+      }
+    }
+    return true;
+  },
+
+  _hasAcceptedExtension(file) {
+    const extension = this._fileExtension(file.name);
+    return (
+      !this.acceptedExtensions || this.acceptedExtensions.includes(extension)
+    );
+  },
+
+  _hasAcceptedMimeType(file) {
+    return (
+      !this.acceptedMimeTypes || this.acceptedMimeTypes.includes(file.type)
+    );
+  },
+
+  _fileExtension(fileName) {
+    return fileName.split(".").pop();
+  },
+});
diff --git a/app/assets/javascripts/discourse/app/templates/components/pick-files-button.hbs b/app/assets/javascripts/discourse/app/templates/components/pick-files-button.hbs
new file mode 100644
index 0000000000..409a3becbd
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/components/pick-files-button.hbs
@@ -0,0 +1,6 @@
+{{d-button action=(action "openSystemFilePicker") label=label icon=icon}}
+{{#if acceptAnyFile}}
+  <input type="file">
+{{else}}
+  <input type="file" accept={{acceptedFileTypesString}}>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/tests/integration/components/pick-files-button-tests.js b/app/assets/javascripts/discourse/tests/integration/components/pick-files-button-tests.js
new file mode 100644
index 0000000000..4c82e9d510
--- /dev/null
+++ b/app/assets/javascripts/discourse/tests/integration/components/pick-files-button-tests.js
@@ -0,0 +1,78 @@
+import componentTest, {
+  setupRenderingTest,
+} from "discourse/tests/helpers/component-test";
+import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
+import hbs from "htmlbars-inline-precompile";
+import { triggerEvent } from "@ember/test-helpers";
+import sinon from "sinon";
+
+function createBlob(mimeType, extension) {
+  const blob = new Blob(["content"], {
+    type: mimeType,
+  });
+  blob.name = `filename${extension}`;
+  return blob;
+}
+
+discourseModule(
+  "Integration | Component | pick-files-button",
+  function (hooks) {
+    setupRenderingTest(hooks);
+
+    componentTest(
+      "it shows alert if a file with an unsupported extension was chosen",
+      {
+        skip: true,
+        template: hbs`
+        {{pick-files-button
+          acceptedFileTypes=this.acceptedFileTypes
+          onFilesChosen=this.onFilesChosen}}`,
+
+        beforeEach() {
+          const expectedExtension = ".json";
+          this.set("acceptedFileTypes", [expectedExtension]);
+          this.set("onFilesChosen", () => {});
+        },
+
+        async test(assert) {
+          sinon.stub(bootbox, "alert");
+
+          const wrongExtension = ".txt";
+          const file = createBlob("text/json", wrongExtension);
+
+          await triggerEvent("input#file-input", "change", { files: [file] });
+
+          assert.ok(bootbox.alert.calledOnce);
+        },
+      }
+    );
+
+    componentTest(
+      "it shows alert if a file with an unsupported MIME type was chosen",
+      {
+        skip: true,
+        template: hbs`
+        {{pick-files-button
+          acceptedFileTypes=this.acceptedFileTypes
+          onFilesChosen=this.onFilesChosen}}`,
+
+        beforeEach() {
+          const expectedMimeType = "text/json";
+          this.set("acceptedFileTypes", [expectedMimeType]);
+          this.set("onFilesChosen", () => {});
+        },
+
+        async test(assert) {
+          sinon.stub(bootbox, "alert");
+
+          const wrongMimeType = "text/plain";
+          const file = createBlob(wrongMimeType, ".json");
+
+          await triggerEvent("input#file-input", "change", { files: [file] });
+
+          assert.ok(bootbox.alert.calledOnce);
+        },
+      }
+    );
+  }
+);
diff --git a/app/assets/stylesheets/common/components/_index.scss b/app/assets/stylesheets/common/components/_index.scss
index 57eb631bd2..02745f3cf0 100644
--- a/app/assets/stylesheets/common/components/_index.scss
+++ b/app/assets/stylesheets/common/components/_index.scss
@@ -17,6 +17,7 @@
 @import "ignored-user-list";
 @import "keyboard_shortcuts";
 @import "navs";
+@import "pick-files-button";
 @import "relative-time-picker";
 @import "share-and-invite-modal";
 @import "svg";
diff --git a/app/assets/stylesheets/common/components/pick-files-button.scss b/app/assets/stylesheets/common/components/pick-files-button.scss
new file mode 100644
index 0000000000..c9945168f0
--- /dev/null
+++ b/app/assets/stylesheets/common/components/pick-files-button.scss
@@ -0,0 +1,5 @@
+.pick-files-button {
+  input[type="file"] {
+    display: none;
+  }
+}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 96af2e71dd..86ec2b065c 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3784,6 +3784,9 @@ en:
         leader: "leader"
       detailed_name: "%{level}: %{name}"
 
+    pick_files_button:
+      unsupported_file_picked: "You have picked an unsupported file. Supported file types – %{types}."
+
   # This section is exported to the javascript for i18n in the admin section
   admin_js:
     type_to_filter: "type to filter..."

From 216dc99f18ff077072a3c99b64bd0862dedc1973 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Fri, 16 Jul 2021 15:13:16 -0300
Subject: [PATCH 18/77] FIX: Media optimization setting was misnamed (#13766)

---
 .../discourse/app/services/media-optimization-worker.js         | 2 +-
 config/locales/server.en.yml                                    | 2 +-
 config/site_settings.yml                                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/services/media-optimization-worker.js b/app/assets/javascripts/discourse/app/services/media-optimization-worker.js
index f108061ad7..29f567404a 100644
--- a/app/assets/javascripts/discourse/app/services/media-optimization-worker.js
+++ b/app/assets/javascripts/discourse/app/services/media-optimization-worker.js
@@ -43,7 +43,7 @@ export default class MediaOptimizationWorkerService extends Service {
     if (
       file.size <
       this.siteSettings
-        .composer_media_optimization_image_kilobytes_optimization_threshold
+        .composer_media_optimization_image_bytes_optimization_threshold
     ) {
       return data;
     }
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 1ae9ed99e9..3504f46d88 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1827,7 +1827,7 @@ en:
     strip_image_metadata: "Strip image metadata."
 
     composer_media_optimization_image_enabled: "Enables client-side media optimization of uploaded image files."
-    composer_media_optimization_image_kilobytes_optimization_threshold: "Minimum image file size to trigger client-side optimization"
+    composer_media_optimization_image_bytes_optimization_threshold: "Minimum image file size to trigger client-side optimization"
     composer_media_optimization_image_resize_dimensions_threshold: "Minimum image width to trigger client-side resize"
     composer_media_optimization_image_resize_width_target: "Images with widths larger than `composer_media_optimization_image_dimensions_resize_threshold` will be resized to this width. Must be >= than `composer_media_optimization_image_dimensions_resize_threshold`."
     composer_media_optimization_image_encode_quality: "JPEG encode quality used in the re-encode process."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index c9b83f777c..f9c6c80ca1 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1415,7 +1415,7 @@ files:
   composer_media_optimization_image_enabled:
     default: false
     client: true
-  composer_media_optimization_image_kilobytes_optimization_threshold:
+  composer_media_optimization_image_bytes_optimization_threshold:
     default: 524288
     client: true
   composer_media_optimization_image_resize_dimensions_threshold:

From 2fc0a3fd93b6c2833e8ae6e68c4b25be744aab62 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Fri, 16 Jul 2021 15:23:04 -0300
Subject: [PATCH 19/77] FEATURE: Enable client-side image optimization by
 default (#13724)

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

diff --git a/config/site_settings.yml b/config/site_settings.yml
index f9c6c80ca1..950cff638c 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1413,7 +1413,7 @@ files:
     default: 100000
     hidden: true
   composer_media_optimization_image_enabled:
-    default: false
+    default: true
     client: true
   composer_media_optimization_image_bytes_optimization_threshold:
     default: 524288

From e12b00eab74674443d09ecf1292be8c9a921a618 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Fri, 16 Jul 2021 15:25:49 -0300
Subject: [PATCH 20/77] FEATURE: Stop checking referer for embeds (#13756)

Flips content_security_policy_frame_ancestors default to enabled, and
removes HTTP_REFERER checks on embed requests, as the new referer
privacy options made the check fragile.
---
 app/controllers/embed_controller.rb     | 24 ++++++------------------
 app/models/embeddable_host.rb           |  2 ++
 config/site_settings.yml                |  2 +-
 spec/components/topic_retriever_spec.rb | 15 +++++++++++++--
 spec/requests/embed_controller_spec.rb  | 12 ++----------
 5 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/app/controllers/embed_controller.rb b/app/controllers/embed_controller.rb
index 2a063adaed..490ff8c698 100644
--- a/app/controllers/embed_controller.rb
+++ b/app/controllers/embed_controller.rb
@@ -5,14 +5,12 @@ class EmbedController < ApplicationController
 
   skip_before_action :check_xhr, :preload_json, :verify_authenticity_token
 
-  before_action :ensure_embeddable, except: [ :info, :topics ]
   before_action :prepare_embeddable, except: [ :info ]
   before_action :ensure_api_request, only: [ :info ]
 
   layout 'embed'
 
   rescue_from Discourse::InvalidAccess do
-    response.headers.delete('X-Frame-Options')
     if current_user.try(:admin?)
       @setup_url = "#{Discourse.base_url}/admin/customize/embedding"
       @show_reason = true
@@ -24,7 +22,6 @@ class EmbedController < ApplicationController
   def topics
     discourse_expires_in 1.minute
 
-    response.headers.delete('X-Frame-Options')
     unless SiteSetting.embed_topics_list?
       render 'embed_topics_error', status: 400
       return
@@ -73,6 +70,11 @@ class EmbedController < ApplicationController
   def comments
     embed_url = params[:embed_url]
     embed_username = params[:discourse_username]
+    embed_topic_id = params[:topic_id]&.to_i
+
+    unless embed_topic_id || EmbeddableHost.url_allowed?(embed_url)
+      raise Discourse::InvalidAccess.new('invalid embed host')
+    end
 
     topic_id = nil
     if embed_url.present?
@@ -147,6 +149,7 @@ class EmbedController < ApplicationController
   private
 
   def prepare_embeddable
+    response.headers.delete('X-Frame-Options')
     @embeddable_css_class = ""
     embeddable_host = EmbeddableHost.record_for_url(request.referer)
     @embeddable_css_class = " class=\"#{embeddable_host.class_name}\"" if embeddable_host.present? && embeddable_host.class_name.present?
@@ -158,19 +161,4 @@ class EmbedController < ApplicationController
   def ensure_api_request
     raise Discourse::InvalidAccess.new('api key not set') if !is_api?
   end
-
-  def ensure_embeddable
-    if !(Rails.env.development? && current_user&.admin?)
-      referer = request.referer
-
-      unless referer && EmbeddableHost.url_allowed?(referer)
-        raise Discourse::InvalidAccess.new('invalid referer host')
-      end
-    end
-
-    response.headers.delete('X-Frame-Options')
-  rescue URI::Error
-    raise Discourse::InvalidAccess.new('invalid referer host')
-  end
-
 end
diff --git a/app/models/embeddable_host.rb b/app/models/embeddable_host.rb
index e76dbce643..212348bc3d 100644
--- a/app/models/embeddable_host.rb
+++ b/app/models/embeddable_host.rb
@@ -44,6 +44,8 @@ class EmbeddableHost < ActiveRecord::Base
   end
 
   def self.url_allowed?(url)
+    return false if url.nil?
+
     # Work around IFRAME reload on WebKit where the referer will be set to the Forum URL
     return true if url&.starts_with?(Discourse.base_url) && EmbeddableHost.exists?
 
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 950cff638c..e9855cdf53 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1640,7 +1640,7 @@ security:
   content_security_policy_collect_reports:
     default: false
   content_security_policy_frame_ancestors:
-    default: false
+    default: true
   content_security_policy_script_src:
     type: simple_list
     default: ""
diff --git a/spec/components/topic_retriever_spec.rb b/spec/components/topic_retriever_spec.rb
index e14379f5cc..c16be0c987 100644
--- a/spec/components/topic_retriever_spec.rb
+++ b/spec/components/topic_retriever_spec.rb
@@ -36,9 +36,9 @@ describe TopicRetriever do
       end
     end
 
-    context "when host is not invalid" do
+    context "when host is valid" do
       before do
-        topic_retriever.stubs(:invalid_url?).returns(false)
+        Fabricate(:embeddable_host, host: 'http://eviltrout.com/')
       end
 
       context "when topics have been retrieved recently" do
@@ -64,6 +64,17 @@ describe TopicRetriever do
       end
     end
 
+    context "when host is invalid" do
+      before do
+        Fabricate(:embeddable_host, host: 'http://not-eviltrout.com/')
+      end
+
+      it "does not perform_retrieve" do
+        topic_retriever.expects(:perform_retrieve).never
+        topic_retriever.retrieve
+      end
+    end
+
     it "works with URLs with whitespaces" do
       expect { TopicRetriever.new(" https://example.com ").retrieve }
         .not_to raise_error
diff --git a/spec/requests/embed_controller_spec.rb b/spec/requests/embed_controller_spec.rb
index ff89614634..44b21a9c63 100644
--- a/spec/requests/embed_controller_spec.rb
+++ b/spec/requests/embed_controller_spec.rb
@@ -150,9 +150,9 @@ describe EmbedController do
       Jobs.run_immediately!
     end
 
-    it "raises an error with no referer" do
+    it "doesn't raises an error with no referer" do
       get '/embed/comments', params: { embed_url: embed_url }
-      expect(response.body).to match(I18n.t('embed.error'))
+      expect(response.body).not_to match(I18n.t('embed.error'))
     end
 
     it "includes CSS from embedded_scss field" do
@@ -266,14 +266,6 @@ describe EmbedController do
 
         expect(response.body).to match('class="example"')
       end
-
-      it "doesn't work with a made up host" do
-        get '/embed/comments',
-          params: { embed_url: embed_url },
-          headers: { 'REFERER' => "http://codinghorror.com/invalid-url" }
-
-        expect(response.body).to match(I18n.t('embed.error'))
-      end
     end
 
     context "CSP frame-ancestors enabled" do

From b0f06b8ed09e49a5121948f2d91c7d9ff5d5f773 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Fri, 16 Jul 2021 14:50:40 -0400
Subject: [PATCH 21/77] FIX: don't allow category and tag tracking settings on
 staged users (#13688)

Configuring staged users to watch categories and tags is a way to sign
them up to get many emails. These emails may be unwanted and get marked
as spam, hurting the site's email deliverability.
Users can opt-in to email notifications by logging on to their
account and configuring their own preferences.

If staff need to be able to configure these preferences on behalf of
staged users, the "allow changing staged user tracking" site setting
can be enabled. Default is to not allow it.

Co-authored-by: Alan Guo Xiang Tan <gxtan1990@gmail.com>
---
 .../discourse/app/controllers/preferences.js  |   1 +
 .../discourse/app/templates/preferences.hbs   |  14 +-
 .../tests/acceptance/preferences-test.js      |  33 +++++
 .../discourse/tests/fixtures/user-fixtures.js | 125 ++++++++++++++++++
 app/serializers/user_serializer.rb            |   5 +
 app/serializers/web_hook_user_serializer.rb   |   1 +
 app/services/user_updater.rb                  |  16 ++-
 config/locales/server.en.yml                  |   2 +
 config/site_settings.yml                      |   2 +
 lib/guardian/user_guardian.rb                 |   4 +
 .../components/guardian/user_guardian_spec.rb |  37 ++++++
 spec/services/user_updater_spec.rb            |  36 ++++-
 12 files changed, 262 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/preferences.js b/app/assets/javascripts/discourse/app/controllers/preferences.js
index 1c0ee0801d..fa4ba1ee7d 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences.js
@@ -1,2 +1,3 @@
 import Controller from "@ember/controller";
+
 export default Controller.extend({});
diff --git a/app/assets/javascripts/discourse/app/templates/preferences.hbs b/app/assets/javascripts/discourse/app/templates/preferences.hbs
index 45f82f56c9..19f90739eb 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences.hbs
@@ -25,17 +25,19 @@
         {{i18n "user.preferences_nav.notifications"}}
       {{/link-to}}
     </li>
-    <li class="indent nav-categories">
-      {{#link-to "preferences.categories"}}
-        {{i18n "user.preferences_nav.categories"}}
-      {{/link-to}}
-    </li>
+    {{#if model.can_change_tracking_preferences}}
+      <li class="indent nav-categories">
+        {{#link-to "preferences.categories"}}
+          {{i18n "user.preferences_nav.categories"}}
+        {{/link-to}}
+      </li>
+    {{/if}}
     <li class="indent nav-users">
       {{#link-to "preferences.users"}}
         {{i18n "user.preferences_nav.users"}}
       {{/link-to}}
     </li>
-    {{#if siteSettings.tagging_enabled}}
+    {{#if (and model.can_change_tracking_preferences siteSettings.tagging_enabled)}}
       <li class="indent nav-tags">
         {{#link-to "preferences.tags"}}
           {{i18n "user.preferences_nav.tags"}}
diff --git a/app/assets/javascripts/discourse/tests/acceptance/preferences-test.js b/app/assets/javascripts/discourse/tests/acceptance/preferences-test.js
index 0014ebc2bf..0d5f64bcda 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/preferences-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/preferences-test.js
@@ -524,3 +524,36 @@ acceptance("Security", function (needs) {
     );
   });
 });
+
+acceptance(
+  "User Preferences for staged user and don't allow tracking prefs",
+  function (needs) {
+    needs.settings({
+      allow_changing_staged_user_tracking: false,
+      tagging_enabled: true,
+    });
+    needs.pretender(preferencesPretender);
+
+    test("staged user doesn't show category and tag preferences", async function (assert) {
+      await visit("/u/staged/preferences");
+
+      assert.ok($("body.user-preferences-page").length, "has the body class");
+      assert.equal(
+        currentURL(),
+        "/u/staged/preferences/account",
+        "defaults to account tab"
+      );
+      assert.ok(exists(".user-preferences"), "it shows the preferences");
+
+      assert.ok(
+        !exists(".preferences-nav .nav-categories a"),
+        "categories tab isn't there for staged users"
+      );
+
+      assert.ok(
+        !exists(".preferences-nav .nav-tags a"),
+        "tags tab isn't there for staged users"
+      );
+    });
+  }
+);
diff --git a/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js
index e1b428f0db..7c23b4631f 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js
@@ -190,6 +190,7 @@ export default {
       card_image_badge_id: 120,
       muted_usernames: [],
       can_change_location: true,
+      can_change_tracking_preferences: true,
       ignored_usernames: [],
       invited_by: {
         id: 1,
@@ -2534,6 +2535,7 @@ export default {
       ignored_usernames: [],
       mailing_list_posts_per_day: 0,
       can_change_bio: true,
+      can_change_tracking_preferences: true,
       user_api_keys: null,
       user_auth_tokens: [],
       invited_by: null,
@@ -3322,4 +3324,127 @@ export default {
       timezone: "Australia/Brisbane",
     },
   },
+  "/u/staged.json": {
+    user_badges: [],
+    badges: [],
+    badge_types: [
+      { id: 1, name: "Gold", sort_order: 9 },
+      { id: 2, name: "Silver", sort_order: 8 },
+      { id: 3, name: "Bronze", sort_order: 7 },
+    ],
+    users: [
+      {
+        id: 20,
+        username: "staged",
+        uploaded_avatar_id: null,
+        avatar_template:
+          "/letter_avatar/staged/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png",
+      },
+      {
+        id: -1,
+        username: "system",
+        uploaded_avatar_id: null,
+        avatar_template:
+          "/letter_avatar/system/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png",
+      },
+    ],
+    topics: [],
+    user: {
+      user_option: {
+        text_size_seq: 1,
+      },
+      id: 20,
+      username: "staged",
+      staged: true,
+      uploaded_avatar_id: null,
+      avatar_template:
+        "/letter_avatar/staged/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png",
+      name: "Staged",
+      email: "staged.user@example.com",
+      associated_accounts: [],
+      last_posted_at: "2015-05-07T15:23:35.074Z",
+      last_seen_at: "2015-05-13T14:34:23.188Z",
+      bio_raw: "",
+      bio_cooked: "",
+      created_at: "2013-02-03T15:19:22.704Z",
+      website: "",
+      location: "",
+      can_edit: true,
+      can_edit_username: true,
+      can_edit_email: true,
+      can_edit_name: true,
+      stats: [],
+      can_send_private_messages: true,
+      can_send_private_message_to_user: true,
+      bio_excerpt: "",
+      trust_level: 0,
+      moderator: false,
+      admin: false,
+      title: null,
+      badge_count: 0,
+      notification_count: 0,
+      has_title_badges: false,
+      custom_fields: {},
+      user_fields: {},
+      pending_count: 0,
+      post_count: 0,
+      can_be_deleted: true,
+      can_delete_all_posts: true,
+      locale: "",
+      email_digests: false,
+      email_messages_level: 0,
+      email_level: 1,
+      digest_after_minutes: 10080,
+      mailing_list_mode: false,
+      auto_track_topics_after_msecs: 60000,
+      new_topic_duration_minutes: 1440,
+      external_links_in_new_tab: false,
+      dynamic_favicon: true,
+      skip_new_user_tips: false,
+      enable_quoting: true,
+      muted_category_ids: [],
+      regular_category_ids: [],
+      tracked_category_ids: [],
+      watched_category_ids: [],
+      watched_first_post_category_ids: [],
+      private_messages_stats: {},
+      gravatar_avatar_upload_id: 5275,
+      custom_avatar_upload_id: 1573,
+      card_image_badge: "/images/avatar.png",
+      card_image_badge_id: 120,
+      muted_usernames: [],
+      can_change_location: true,
+      can_change_tracking_preferences: false,
+      ignored_usernames: [],
+      invited_by: {
+        id: 1,
+        username: "sam",
+        uploaded_avatar_id: null,
+        avatar_template:
+          "/letter_avatar/sam/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png",
+      },
+      custom_groups: [],
+      featured_user_badge_ids: [],
+      card_badge: null,
+      user_auth_tokens: [],
+      user_notification_schedule: {
+        enabled: false,
+        day_0_start_time: 480,
+        day_0_end_time: 1020,
+        day_1_start_time: 480,
+        day_1_end_time: 1020,
+        day_2_start_time: 480,
+        day_2_end_time: 1020,
+        day_3_start_time: 480,
+        day_3_end_time: 1020,
+        day_4_start_time: 480,
+        day_4_end_time: 1020,
+        day_5_start_time: 480,
+        day_5_end_time: 1020,
+        day_6_start_time: 480,
+        day_6_end_time: 1020,
+      },
+      timezone: "Australia/Brisbane",
+    },
+  },
 };
diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb
index 1c9afecd4e..01df2bddfe 100644
--- a/app/serializers/user_serializer.rb
+++ b/app/serializers/user_serializer.rb
@@ -57,6 +57,7 @@ class UserSerializer < UserCardSerializer
                      :can_change_bio,
                      :can_change_location,
                      :can_change_website,
+                     :can_change_tracking_preferences,
                      :user_api_keys,
                      :user_auth_tokens,
                      :user_notification_schedule,
@@ -132,6 +133,10 @@ class UserSerializer < UserCardSerializer
     !(SiteSetting.enable_discourse_connect && SiteSetting.discourse_connect_overrides_website)
   end
 
+  def can_change_tracking_preferences
+    scope.can_change_tracking_preferences?(object)
+  end
+
   def user_api_keys
     keys = object.user_api_keys.where(revoked_at: nil).map do |k|
       {
diff --git a/app/serializers/web_hook_user_serializer.rb b/app/serializers/web_hook_user_serializer.rb
index 43200e4fd6..16f32b6d4c 100644
--- a/app/serializers/web_hook_user_serializer.rb
+++ b/app/serializers/web_hook_user_serializer.rb
@@ -30,6 +30,7 @@ class WebHookUserSerializer < UserSerializer
     can_change_bio
     can_change_location
     can_change_website
+    can_change_tracking_preferences
     user_api_keys
     group_users
     user_auth_tokens
diff --git a/app/services/user_updater.rb b/app/services/user_updater.rb
index 7c56d8eebe..1192419727 100644
--- a/app/services/user_updater.rb
+++ b/app/services/user_updater.rb
@@ -129,15 +129,17 @@ class UserUpdater
       user.flair_group_id = attributes[:flair_group_id]
     end
 
-    CATEGORY_IDS.each do |attribute, level|
-      if ids = attributes[attribute]
-        CategoryUser.batch_set(user, level, ids)
+    if @guardian.can_change_tracking_preferences?(user)
+      CATEGORY_IDS.each do |attribute, level|
+        if ids = attributes[attribute]
+          CategoryUser.batch_set(user, level, ids)
+        end
       end
-    end
 
-    TAG_NAMES.each do |attribute, level|
-      if attributes.has_key?(attribute)
-        TagUser.batch_set(user, level, attributes[attribute]&.split(',') || [])
+      TAG_NAMES.each do |attribute, level|
+        if attributes.has_key?(attribute)
+          TagUser.batch_set(user, level, attributes[attribute]&.split(',') || [])
+        end
       end
     end
 
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 3504f46d88..d376a5e09e 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2326,6 +2326,8 @@ en:
 
     create_revision_on_bulk_topic_moves: "Create revision for first posts when topics are moved into a new category in bulk."
 
+    allow_changing_staged_user_tracking: "Allow a staged user's category and tag notification preferences to be changed by an admin user."
+
     errors:
       invalid_email: "Invalid email address."
       invalid_username: "There's no user with that username."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index e9855cdf53..b01c9fc426 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -2309,6 +2309,8 @@ uncategorized:
   create_revision_on_bulk_topic_moves:
     default: true
 
+  allow_changing_staged_user_tracking: false
+
 user_preferences:
   default_email_digest_frequency:
     enum: "DigestEmailSiteSetting"
diff --git a/lib/guardian/user_guardian.rb b/lib/guardian/user_guardian.rb
index 17a908984a..cd9dda0921 100644
--- a/lib/guardian/user_guardian.rb
+++ b/lib/guardian/user_guardian.rb
@@ -179,4 +179,8 @@ module UserGuardian
   def can_delete_sso_record?(user)
     SiteSetting.enable_discourse_connect && user && is_admin?
   end
+
+  def can_change_tracking_preferences?(user)
+    (SiteSetting.allow_changing_staged_user_tracking || !user.staged) && can_edit_user?(user)
+  end
 end
diff --git a/spec/components/guardian/user_guardian_spec.rb b/spec/components/guardian/user_guardian_spec.rb
index 70c9ec1ba2..63f8b3a5e7 100644
--- a/spec/components/guardian/user_guardian_spec.rb
+++ b/spec/components/guardian/user_guardian_spec.rb
@@ -455,4 +455,41 @@ describe UserGuardian do
       expect(guardian.can_upload_user_card_background?(trust_level_1)).to eq(false)
     end
   end
+
+  describe "#can_change_tracking_preferences?" do
+    let(:staged_user) { Fabricate(:staged) }
+    let(:admin_user) { Fabricate(:admin) }
+
+    it "is true for normal TL0 user" do
+      expect(Guardian.new(user).can_change_tracking_preferences?(user)).to eq(true)
+    end
+
+    it "is true for admin user" do
+      expect(Guardian.new(admin_user).can_change_tracking_preferences?(admin_user)).to eq(true)
+    end
+
+    context "allow_changing_staged_user_tracking is false" do
+      before { SiteSetting.allow_changing_staged_user_tracking = false }
+
+      it "is false to staged user" do
+        expect(Guardian.new(staged_user).can_change_tracking_preferences?(staged_user)).to eq(false)
+      end
+
+      it "is false for staged user as admin user" do
+        expect(Guardian.new(admin_user).can_change_tracking_preferences?(staged_user)).to eq(false)
+      end
+    end
+
+    context "allow_changing_staged_user_tracking is true" do
+      before { SiteSetting.allow_changing_staged_user_tracking = true }
+
+      it "is true to staged user" do
+        expect(Guardian.new(staged_user).can_change_tracking_preferences?(staged_user)).to eq(true)
+      end
+
+      it "is true for staged user as admin user" do
+        expect(Guardian.new(admin_user).can_change_tracking_preferences?(staged_user)).to eq(true)
+      end
+    end
+  end
 end
diff --git a/spec/services/user_updater_spec.rb b/spec/services/user_updater_spec.rb
index 415375e802..4f9545d803 100644
--- a/spec/services/user_updater_spec.rb
+++ b/spec/services/user_updater_spec.rb
@@ -52,7 +52,7 @@ describe UserUpdater do
 
     it 'can update categories and tags' do
       user = Fabricate(:user)
-      updater = UserUpdater.new(acting_user, user)
+      updater = UserUpdater.new(user, user)
       updater.update(watched_tags: "#{tag.name},#{tag2.name}", muted_category_ids: [category.id])
 
       expect(TagUser.where(
@@ -72,7 +72,41 @@ describe UserUpdater do
         category_id: category.id,
         notification_level: CategoryUser.notification_levels[:muted]
       ).count).to eq(1)
+    end
 
+    context "staged user" do
+      let(:staged_user) { Fabricate(:staged) }
+
+      context "allow_changing_staged_user_tracking is false" do
+        before { SiteSetting.allow_changing_staged_user_tracking = false }
+
+        it "doesn't update muted categories and watched tags" do
+          updater = UserUpdater.new(Fabricate(:admin), staged_user)
+          updater.update(watched_tags: "#{tag.name}", muted_category_ids: [category.id])
+          expect(TagUser.exists?(user_id: staged_user.id)).to eq(false)
+          expect(CategoryUser.exists?(user_id: staged_user.id)).to eq(false)
+        end
+      end
+
+      context "allow_changing_staged_user_tracking is true" do
+        before { SiteSetting.allow_changing_staged_user_tracking = true }
+
+        it "updates muted categories and watched tags" do
+          updater = UserUpdater.new(Fabricate(:admin), staged_user)
+          updater.update(watched_tags: "#{tag.name}", muted_category_ids: [category.id])
+          expect(TagUser.exists?(
+            user_id: staged_user.id,
+            tag_id: tag.id,
+            notification_level: TagUser.notification_levels[:watching]
+          )).to eq(true)
+
+          expect(CategoryUser.exists?(
+            user_id: staged_user.id,
+            category_id: category.id,
+            notification_level: CategoryUser.notification_levels[:muted]
+          )).to eq(true)
+        end
+      end
     end
 
     it "doesn't remove notification prefs when updating something else" do

From 65d4a661c976e25c80934064b08070da7abd722a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jul 2021 01:21:20 +0200
Subject: [PATCH 22/77] Build(deps): Bump excon from 0.84.0 to 0.85.0 (#13772)

Bumps [excon](https://github.com/excon/excon) from 0.84.0 to 0.85.0.
- [Release notes](https://github.com/excon/excon/releases)
- [Changelog](https://github.com/excon/excon/blob/master/changelog.txt)
- [Commits](https://github.com/excon/excon/compare/v0.84.0...v0.85.0)

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

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index a26a45e88a..8cc8acf29c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -129,7 +129,7 @@ GEM
       sprockets (>= 3.3, < 4.1)
     ember-source (2.18.2)
     erubi (1.10.0)
-    excon (0.84.0)
+    excon (0.85.0)
     execjs (2.8.1)
     exifr (1.3.9)
     fabrication (2.22.0)

From 55fc661629baaafad66d64f658be4c5568f1e92e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jul 2021 01:21:31 +0200
Subject: [PATCH 23/77] Build(deps): Bump ruby2_keywords from 0.0.4 to 0.0.5
 (#13771)

Bumps [ruby2_keywords](https://github.com/ruby/ruby2_keywords) from 0.0.4 to 0.0.5.
- [Release notes](https://github.com/ruby/ruby2_keywords/releases)
- [Commits](https://github.com/ruby/ruby2_keywords/compare/v0.0.4...v0.0.5)

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

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 8cc8acf29c..e1a9665ad8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -407,7 +407,7 @@ GEM
     ruby-readability (0.7.0)
       guess_html_encoding (>= 0.0.4)
       nokogiri (>= 1.6.0)
-    ruby2_keywords (0.0.4)
+    ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     sanitize (5.2.3)
       crass (~> 1.0.2)

From 4e9b4136b0bdb97746c05a4da3dcb882c208f180 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Sun, 18 Jul 2021 21:30:35 -0400
Subject: [PATCH 24/77] FIX: Alignment of user badges in user card (#13770)

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

diff --git a/app/assets/stylesheets/common/components/user-card.scss b/app/assets/stylesheets/common/components/user-card.scss
index 82e876602e..d3c5ba832f 100644
--- a/app/assets/stylesheets/common/components/user-card.scss
+++ b/app/assets/stylesheets/common/components/user-card.scss
@@ -237,6 +237,7 @@ $avatar_margin: -50px; // negative margin makes avatars extend above cards
     }
     .user-card-badge-link,
     .more-user-badges {
+      vertical-align: top;
       display: inline-block;
     }
     .more-user-badges a {

From ec9a2a04f3f8614c24b74992c54f0c1bf11b7d5f Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <gerhard.schlager@discourse.org>
Date: Mon, 19 Jul 2021 03:30:48 +0200
Subject: [PATCH 25/77] Fix i18n issues reported on Crowdin (#13769)

* Removes unused strings
* Clarifies some of the strings
* Fixes typos

@discourse-translator-bot keep_translations_and_approvals
---
 config/locales/client.en.yml                    | 17 -----------------
 config/locales/server.en.yml                    | 15 +++++++--------
 .../config/locales/server.en.yml                |  2 +-
 plugins/styleguide/config/locales/server.en.yml |  2 +-
 4 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 86ec2b065c..4eda0fe814 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -245,7 +245,6 @@ en:
     conduct: "Code of Conduct"
     mobile_view: "Mobile View"
     desktop_view: "Desktop View"
-    you: "You"
     or: "or"
     now: "just now"
     read_more: "read more"
@@ -814,8 +813,6 @@ en:
         public: "Public"
         private: "Private"
         public_groups: "Public Groups"
-        automatic_group: Automatic Group
-        close_group: Close Group
         my_groups: "My Groups"
         group_type: "Group type"
         is_group_user: "Member"
@@ -928,7 +925,6 @@ en:
       posts: "Posts"
       topics: "Topics"
       latest: "Latest"
-      toggle_ordering: "toggle ordering control"
       subcategories: "Subcategories"
       muted: "Muted categories"
       topic_sentence:
@@ -1410,7 +1406,6 @@ en:
         browser_last_seen: "%{browser} | %{date}"
 
       last_posted: "Last Post"
-      last_emailed: "Last Emailed"
       last_seen: "Seen"
       created: "Joined"
       log_out: "Log Out"
@@ -2440,13 +2435,6 @@ en:
       defer:
         help: "Mark as unread"
         title: "Defer"
-      feature_on_profile:
-        help: "Add a link to this topic on your user card and profile"
-        title: "Feature On Profile"
-      remove_from_profile:
-        warning: "Your profile already has a featured topic. If you continue, this topic will replace the existing topic."
-        help: "Remove the link to this topic on your user profile"
-        title: "Remove From Profile"
 
       list: "Topics"
       new: "new topic"
@@ -2987,9 +2975,6 @@ en:
       wiki:
         about: "this post is a wiki"
 
-      archetypes:
-        save: "Save Options"
-
       few_likes_left: "Thanks for sharing the love! You only have a few likes left for today."
 
       controls:
@@ -3141,7 +3126,6 @@ en:
         show_all: "Show all"
 
     category:
-      can: "can&hellip; "
       none: "(no category)"
       all: "All categories"
       choose: "category&hellip;"
@@ -3175,7 +3159,6 @@ en:
       save_error: There was an error saving the category.
       name: "Category Name"
       description: "Description"
-      topic: "category topic"
       logo: "Category Logo Image"
       background_image: "Category Background Image"
       badge_colors: "Badge colors"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index d376a5e09e..f083054b1a 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -202,7 +202,7 @@ en:
       default_categories_already_selected: "You cannot select a category used in another list."
       default_tags_already_selected: "You cannot select a tag used in another list."
       s3_upload_bucket_is_required: "You cannot enable uploads to S3 unless you've provided the 's3_upload_bucket'."
-      enable_s3_uploads_is_required: "You cannot enable inventory to S3 unless you've enabled the S3 uploads."
+      enable_s3_uploads_is_required: "You cannot enable usage of the S3 inventory unless you've enabled S3 uploads."
       page_publishing_requirements: "Page publishing cannot be enabled if secure media is enabled."
       s3_backup_requires_s3_settings: "You cannot use S3 as backup location unless you've provided the '%{setting_name}'."
       s3_bucket_reused: "You cannot use the same bucket for 's3_upload_bucket' and 's3_backup_bucket'. Choose a different bucket or use a different path for each bucket."
@@ -247,8 +247,8 @@ en:
     invite_exists: "You already invited <b>%{email}</b>."
     invalid_email: "%{email} isn't a valid email address."
     rate_limit:
-      one: "You have already sent %{count} invite in the last day, please wait %{time_left} before trying again."
-      other: "You have already sent %{count} invites in the last day, please wait %{time_left} before trying again."
+      one: "You have already sent %{count} invite in the last 24 hours, please wait %{time_left} before trying again."
+      other: "You have already sent %{count} invites in the last 24 hours, please wait %{time_left} before trying again."
     confirm_email: "<p>You’re almost done! We sent an activation mail to your email address. Please follow the instructions in the mail to activate your account.</p><p>If it doesn’t arrive, check your spam folder.</p>"
     cant_invite_to_group: "You are not allowed to invite users to specified group(s). Make sure you are owner of the group(s) you are trying to invite to."
     disabled_errors:
@@ -1634,7 +1634,7 @@ en:
     post_menu_hidden_items: "The menu items to hide by default in the post menu unless an expansion ellipsis is clicked on."
     share_links: "Determine which items appear on the share dialog, and in what order."
     site_contact_username: "A valid staff username to send all automated messages from. If left blank the default System account will be used."
-    site_contact_group_name: "A valid group name to be invited to all automated messages."
+    site_contact_group_name: "A valid name of a group that gets invited to all automatically sent private messages."
     send_welcome_message: "Send all new users a welcome message with a quick start guide."
     send_tl1_welcome_message: "Send new trust level 1 users a welcome message."
     send_tl2_promotion_message: "Send new trust level 2 users a message about promotion."
@@ -1646,7 +1646,7 @@ en:
     topics_per_period_in_top_summary: "Number of top topics shown in the default top topics summary."
     topics_per_period_in_top_page: "Number of top topics shown on the expanded 'Show More' top topics."
     redirect_users_to_top_page: "Automatically redirect new and long absent users to the top page."
-    top_page_default_timeframe: "Default timeframe for the top view page."
+    top_page_default_timeframe: "Default timeframe for the top page."
     moderators_view_emails: "Allow moderators to view user emails"
     prioritize_username_in_ux: "Show username first on user page, user card and posts (when disabled name is shown first)"
     enable_rich_text_paste: "Enable automatic HTML to Markdown conversion when pasting text into the composer. (Experimental)"
@@ -1877,7 +1877,7 @@ en:
     min_trust_to_allow_self_wiki: "The minimum trust level required to make user's own post wiki."
 
     min_trust_to_send_messages: "The minimum trust level required to create new personal messages."
-    min_trust_to_send_email_messages: "The minimum trust level requred to send personal messages via email."
+    min_trust_to_send_email_messages: "The minimum trust level required to send personal messages via email."
     min_trust_to_flag_posts: "The minimum trust level required to flag posts"
     min_trust_to_post_links: "The minimum trust level required to include links in posts"
     min_trust_to_post_embedded_media: "The minimum trust level required to embed media items in a post"
@@ -2051,7 +2051,7 @@ en:
     imap_polling_period_mins: "The period in minutes between checking the IMAP accounts for emails."
     imap_polling_old_emails: "The maximum number of old emails (processed) to be updated every time an IMAP box is polled (0 for all)."
     imap_polling_new_emails: "The maximum number of new emails (unprocessed) to be updated every time an IMAP box is polled ."
-    imap_batch_import_email: "The minimum number of new emails that trigger import mode (disables post alerts)."
+    imap_batch_import_email: "The minimum number of new emails that trigger import mode (disables notifications for imported posts)."
 
     email_prefix: "The [label] used in the subject of emails. It will default to 'title' if not set."
     email_site_title: "The title of the site used as the sender of emails from the site. Default to 'title' if not set. If your 'title' contains characters that are not allowed in email sender strings, use this setting."
@@ -2403,7 +2403,6 @@ en:
     invite_redeem_failed: "Invite redemption failed. Please contact the site's administrator."
 
   original_poster: "Original Poster"
-  most_posts: "Most Posts"
   most_recent_poster: "Most Recent Poster"
   frequent_poster: "Frequent Poster"
   # Example: "Original Poster, Most Recent Poster"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.en.yml b/plugins/discourse-narrative-bot/config/locales/server.en.yml
index 9abd897450..e96dd754e5 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.en.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.en.yml
@@ -48,7 +48,7 @@ en:
         one: "I only have %{count} die. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), I know!"
         other: "I only have %{count} dice. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), I know!"
       out_of_range: |-
-        Did you know that [the maximum number of sides](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) for a mathematically fair die is 120?
+        Did you know that [the maximum number of sides](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) for a mathematically fair dice is 120?
       results: |-
         > :game_die: %{results}
 
diff --git a/plugins/styleguide/config/locales/server.en.yml b/plugins/styleguide/config/locales/server.en.yml
index f7cdd1bbe1..09e4e2e5c2 100644
--- a/plugins/styleguide/config/locales/server.en.yml
+++ b/plugins/styleguide/config/locales/server.en.yml
@@ -1,4 +1,4 @@
 en:
   site_settings:
-    styleguide_enabled: "Enable a `/styleguide` path to aid in styling of Discourse"
+    styleguide_enabled: 'Enable a "/styleguide" path to aid in styling of Discourse'
     styleguide_admin_only: "Limits visibility of the styleguide to admins"

From 6d999fb0873e1c85745110a5c6cecee8a1fb0535 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Sun, 18 Jul 2021 21:31:22 -0400
Subject: [PATCH 26/77] DEV: Don't use chunked encoding in development mode
 (#13768)

The express server and http-proxy seem to buffer quite a bit and that
slows down message bus.
---
 .../javascripts/discourse/app/initializers/message-bus.js      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/initializers/message-bus.js b/app/assets/javascripts/discourse/app/initializers/message-bus.js
index 2e2df03710..2309ba066e 100644
--- a/app/assets/javascripts/discourse/app/initializers/message-bus.js
+++ b/app/assets/javascripts/discourse/app/initializers/message-bus.js
@@ -86,7 +86,8 @@ export default {
     messageBus.baseUrl =
       siteSettings.long_polling_base_url.replace(/\/$/, "") + "/";
 
-    messageBus.enableChunkedEncoding = siteSettings.enable_chunked_encoding;
+    messageBus.enableChunkedEncoding =
+      isProduction() && siteSettings.enable_chunked_encoding;
 
     if (messageBus.baseUrl !== "/") {
       messageBus.ajax = function (opts) {

From 1c82989f779a01721fdc2b6e23c3e7aab7b1a338 Mon Sep 17 00:00:00 2001
From: Osama Sayegh <asooomaasoooma90@gmail.com>
Date: Mon, 19 Jul 2021 04:33:58 +0300
Subject: [PATCH 27/77] FEATURE: Add filter box to the themes/components list
 (#13767)

---
 .../admin/addon/components/themes-list.js     |  58 ++++--
 .../templates/components/themes-list.hbs      |  11 ++
 .../components/themes-list-test.js            | 180 ++++++++++++++++--
 .../stylesheets/common/admin/customize.scss   |  31 +++
 config/locales/client.en.yml                  |   1 +
 5 files changed, 246 insertions(+), 35 deletions(-)

diff --git a/app/assets/javascripts/admin/addon/components/themes-list.js b/app/assets/javascripts/admin/addon/components/themes-list.js
index 715ca9ccee..ca1d872f46 100644
--- a/app/assets/javascripts/admin/addon/components/themes-list.js
+++ b/app/assets/javascripts/admin/addon/components/themes-list.js
@@ -1,8 +1,9 @@
 import { COMPONENTS, THEMES } from "admin/models/theme";
-import { equal, gt } from "@ember/object/computed";
+import { equal, gt, gte } from "@ember/object/computed";
 import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
 import { inject as service } from "@ember/service";
+import { action } from "@ember/object";
 
 export default Component.extend({
   router: service(),
@@ -10,10 +11,12 @@ export default Component.extend({
   COMPONENTS,
 
   classNames: ["themes-list"],
+  filterTerm: null,
 
   hasThemes: gt("themesList.length", 0),
   hasActiveThemes: gt("activeThemes.length", 0),
   hasInactiveThemes: gt("inactiveThemes.length", 0),
+  showFilter: gte("themesList.length", 10),
 
   themesTabActive: equal("currentTab", THEMES),
   componentsTabActive: equal("currentTab", COMPONENTS),
@@ -31,28 +34,36 @@ export default Component.extend({
     "themesList",
     "currentTab",
     "themesList.@each.user_selectable",
-    "themesList.@each.default"
+    "themesList.@each.default",
+    "filterTerm"
   )
   inactiveThemes(themes) {
+    let results;
     if (this.componentsTabActive) {
-      return themes.filter((theme) => theme.get("parent_themes.length") <= 0);
+      results = themes.filter(
+        (theme) => theme.get("parent_themes.length") <= 0
+      );
+    } else {
+      results = themes.filter(
+        (theme) => !theme.get("user_selectable") && !theme.get("default")
+      );
     }
-    return themes.filter(
-      (theme) => !theme.get("user_selectable") && !theme.get("default")
-    );
+    return this._filterThemes(results, this.filterTerm);
   },
 
   @discourseComputed(
     "themesList",
     "currentTab",
     "themesList.@each.user_selectable",
-    "themesList.@each.default"
+    "themesList.@each.default",
+    "filterTerm"
   )
   activeThemes(themes) {
+    let results;
     if (this.componentsTabActive) {
-      return themes.filter((theme) => theme.get("parent_themes.length") > 0);
+      results = themes.filter((theme) => theme.get("parent_themes.length") > 0);
     } else {
-      return themes
+      results = themes
         .filter((theme) => theme.get("user_selectable") || theme.get("default"))
         .sort((a, b) => {
           if (a.get("default") && !b.get("default")) {
@@ -66,16 +77,29 @@ export default Component.extend({
             .localeCompare(b.get("name").toLowerCase());
         });
     }
+    return this._filterThemes(results, this.filterTerm);
   },
 
-  actions: {
-    changeView(newTab) {
-      if (newTab !== this.currentTab) {
-        this.set("currentTab", newTab);
+  _filterThemes(themes, term) {
+    term = term?.trim()?.toLowerCase();
+    if (!term) {
+      return themes;
+    }
+    return themes.filter(({ name }) => name.toLowerCase().includes(term));
+  },
+
+  @action
+  changeView(newTab) {
+    if (newTab !== this.currentTab) {
+      this.set("currentTab", newTab);
+      if (!this.showFilter) {
+        this.set("filterTerm", null);
       }
-    },
-    navigateToTheme(theme) {
-      this.router.transitionTo("adminCustomizeThemes.show", theme);
-    },
+    }
+  },
+
+  @action
+  navigateToTheme(theme) {
+    this.router.transitionTo("adminCustomizeThemes.show", theme);
   },
 });
diff --git a/app/assets/javascripts/admin/addon/templates/components/themes-list.hbs b/app/assets/javascripts/admin/addon/templates/components/themes-list.hbs
index a02fb2f2ce..ab342b1b93 100644
--- a/app/assets/javascripts/admin/addon/templates/components/themes-list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/themes-list.hbs
@@ -15,6 +15,17 @@
 </div>
 
 <div class="themes-list-container">
+  {{#if showFilter}}
+    <div class="themes-list-filter themes-list-item">
+      {{input
+        class="filter-input"
+        placeholder=(i18n "admin.customize.theme.filter_placeholder")
+        autocomplete="discourse"
+        value=(mut filterTerm)
+      }}
+      {{d-icon "search"}}
+    </div>
+  {{/if}}
   {{#if hasThemes}}
     {{#if hasActiveThemes}}
       {{#each activeThemes as |theme|}}
diff --git a/app/assets/javascripts/discourse/tests/integration/components/themes-list-test.js b/app/assets/javascripts/discourse/tests/integration/components/themes-list-test.js
index 375340ae6e..cb820a2160 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/themes-list-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/themes-list-test.js
@@ -6,26 +6,37 @@ import componentTest, {
 import {
   count,
   discourseModule,
+  exists,
+  query,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
 import hbs from "htmlbars-inline-precompile";
+import { click, fillIn } from "@ember/test-helpers";
+
+function createThemes(itemsCount, customAttributesCallback) {
+  return [...Array(itemsCount)].map((_, i) => {
+    const attrs = { name: `Theme ${i + 1}` };
+    if (customAttributesCallback) {
+      Object.assign(attrs, customAttributesCallback(i + 1));
+    }
+    return Theme.create(attrs);
+  });
+}
 
 discourseModule("Integration | Component | themes-list", function (hooks) {
   setupRenderingTest(hooks);
   componentTest("current tab is themes", {
     template: hbs`{{themes-list themes=themes components=components currentTab=currentTab}}`,
     beforeEach() {
-      this.themes = [1, 2, 3, 4, 5].map((num) =>
-        Theme.create({ name: `Theme ${num}` })
-      );
-      this.components = [1, 2, 3, 4, 5].map((num) =>
-        Theme.create({
-          name: `Child ${num}`,
+      this.themes = createThemes(5);
+      this.components = createThemes(5, (n) => {
+        return {
+          name: `Child ${n}`,
           component: true,
-          parentThemes: [this.themes[num - 1]],
+          parentThemes: [this.themes[n - 1]],
           parent_themes: [1, 2, 3, 4, 5],
-        })
-      );
+        };
+      });
       this.setProperties({
         themes: this.themes,
         components: this.components,
@@ -94,17 +105,15 @@ discourseModule("Integration | Component | themes-list", function (hooks) {
   componentTest("current tab is components", {
     template: hbs`{{themes-list themes=themes components=components currentTab=currentTab}}`,
     beforeEach() {
-      this.themes = [1, 2, 3, 4, 5].map((num) =>
-        Theme.create({ name: `Theme ${num}` })
-      );
-      this.components = [1, 2, 3, 4, 5].map((num) =>
-        Theme.create({
-          name: `Child ${num}`,
+      this.themes = createThemes(5);
+      this.components = createThemes(5, (n) => {
+        return {
+          name: `Child ${n}`,
           component: true,
-          parentThemes: [this.themes[num - 1]],
+          parentThemes: [this.themes[n - 1]],
           parent_themes: [1, 2, 3, 4, 5],
-        })
-      );
+        };
+      });
       this.setProperties({
         themes: this.themes,
         components: this.components,
@@ -144,4 +153,139 @@ discourseModule("Integration | Component | themes-list", function (hooks) {
       );
     },
   });
+
+  componentTest(
+    "themes filter is not visible when there are less than 10 themes",
+    {
+      template: hbs`{{themes-list themes=themes components=[] currentTab=currentTab}}`,
+
+      beforeEach() {
+        const themes = createThemes(9);
+        this.setProperties({
+          themes,
+          currentTab: THEMES,
+        });
+      },
+      async test(assert) {
+        assert.ok(
+          !exists(".themes-list-filter"),
+          "filter input not shown when we have fewer than 10 themes"
+        );
+      },
+    }
+  );
+
+  componentTest(
+    "themes filter keeps themes whose names include the filter term",
+    {
+      template: hbs`{{themes-list themes=themes components=[] currentTab=currentTab}}`,
+
+      beforeEach() {
+        const themes = ["osama", "OsAmaa", "osAMA 1234"]
+          .map((name) => Theme.create({ name: `Theme ${name}` }))
+          .concat(createThemes(7));
+        this.setProperties({
+          themes,
+          currentTab: THEMES,
+        });
+      },
+      async test(assert) {
+        assert.ok(exists(".themes-list-filter"));
+        await fillIn(".themes-list-filter .filter-input", "  oSAma ");
+        assert.deepEqual(
+          Array.from(queryAll(".themes-list-item .name")).map((node) =>
+            node.textContent.trim()
+          ),
+          ["Theme osama", "Theme OsAmaa", "Theme osAMA 1234"],
+          "only themes whose names include the filter term are shown"
+        );
+      },
+    }
+  );
+
+  componentTest(
+    "switching between themes and components tabs keeps the filter visible only if both tabs have at least 10 items",
+    {
+      template: hbs`{{themes-list themes=themes components=components currentTab=currentTab}}`,
+
+      beforeEach() {
+        const themes = createThemes(10, (n) => {
+          return { name: `Theme ${n}${n}` };
+        });
+        const components = createThemes(5, (n) => {
+          return {
+            name: `Component ${n}${n}`,
+            component: true,
+            parent_themes: [1],
+            parentThemes: [1],
+          };
+        });
+        this.setProperties({
+          themes,
+          components,
+          currentTab: THEMES,
+        });
+      },
+      async test(assert) {
+        await fillIn(".themes-list-filter .filter-input", "11");
+        assert.equal(
+          query(".themes-list-container").textContent.trim(),
+          "Theme 11",
+          "only 1 theme is shown"
+        );
+        await click(".themes-list-header .components-tab");
+        assert.ok(
+          !exists(".themes-list-filter"),
+          "filter input/term do not persist when we switch to the other" +
+            " tab because it has fewer than 10 items"
+        );
+        assert.deepEqual(
+          Array.from(queryAll(".themes-list-item .name")).map((node) =>
+            node.textContent.trim()
+          ),
+          [
+            "Component 11",
+            "Component 22",
+            "Component 33",
+            "Component 44",
+            "Component 55",
+          ],
+          "all components are shown"
+        );
+
+        this.set(
+          "components",
+          this.components.concat(
+            createThemes(5, (n) => {
+              n += 5;
+              return {
+                name: `Component ${n}${n}`,
+                component: true,
+                parent_themes: [1],
+                parentThemes: [1],
+              };
+            })
+          )
+        );
+        assert.ok(
+          exists(".themes-list-filter"),
+          "filter is now shown for the components tab"
+        );
+
+        await fillIn(".themes-list-filter .filter-input", "66");
+        assert.equal(
+          query(".themes-list-container").textContent.trim(),
+          "Component 66",
+          "only 1 component is shown"
+        );
+
+        await click(".themes-list-header .themes-tab");
+        assert.equal(
+          query(".themes-list-container").textContent.trim(),
+          "Theme 66",
+          "filter term persisted between tabs because both have more than 10 items"
+        );
+      },
+    }
+  );
 });
diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss
index 045235d3c1..4eeb081142 100644
--- a/app/assets/stylesheets/common/admin/customize.scss
+++ b/app/assets/stylesheets/common/admin/customize.scss
@@ -295,6 +295,37 @@
         width: 100%;
       }
     }
+
+    .themes-list-filter {
+      display: flex;
+      align-items: center;
+      position: sticky;
+      top: 0;
+      background: var(--secondary);
+      z-index: z("base");
+      height: 3em;
+
+      .d-icon {
+        position: absolute;
+        padding-left: 0.5em;
+      }
+
+      .filter-input {
+        width: 100%;
+        height: 100%;
+        margin: 0;
+        border: 0;
+        padding-left: 2em;
+
+        &:focus {
+          outline: 0;
+
+          ~ .d-icon {
+            color: var(--tertiary-hover);
+          }
+        }
+      }
+    }
   }
 
   .theme.settings {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 4eda0fe814..0a5974c9fe 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4230,6 +4230,7 @@ en:
           theme: "Theme"
           component: "Component"
           components: "Components"
+          filter_placeholder: "type to filter…"
           theme_name: "Theme name"
           component_name: "Component name"
           themes_intro: "Select an existing theme or install a new one to get started"

From 8de89895761876a2f8f174afb46b4e4dffc09ef2 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Sun, 18 Jul 2021 21:34:44 -0400
Subject: [PATCH 28/77] UX: consistent share modal & popup, refactoring
 (#13759)

---
 .../discourse/app/components/share-popup.js   |   7 +-
 .../app/templates/components/share-popup.hbs  |  53 ++--
 .../app/templates/components/share-source.hbs |   8 +-
 .../app/templates/modal/create-invite.hbs     |   4 +-
 .../app/templates/modal/share-topic.hbs       |  81 ++---
 .../tests/acceptance/share-topic-test.js      |   2 +-
 .../discourse/tests/acceptance/topic-test.js  |   4 +-
 app/assets/stylesheets/common/base/modal.scss | 160 ----------
 .../stylesheets/common/base/share_link.scss   | 288 +++++++++++++-----
 9 files changed, 305 insertions(+), 302 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/share-popup.js b/app/assets/javascripts/discourse/app/components/share-popup.js
index a2d9decc13..85e815ce50 100644
--- a/app/assets/javascripts/discourse/app/components/share-popup.js
+++ b/app/assets/javascripts/discourse/app/components/share-popup.js
@@ -49,8 +49,11 @@ export default Component.extend({
       if (this.element) {
         const linkInput = this.element.querySelector("#share-link input");
         linkInput.value = this.link;
-        linkInput.setSelectionRange(0, this.link.length);
-        linkInput.focus();
+        if (!this.site.mobileView) {
+          // if the input is auto-focused on mobile, iOS requires two taps of the copy button
+          linkInput.setSelectionRange(0, this.link.length);
+          linkInput.focus();
+        }
       }
     }, 200);
   },
diff --git a/app/assets/javascripts/discourse/app/templates/components/share-popup.hbs b/app/assets/javascripts/discourse/app/templates/components/share-popup.hbs
index 695be0aeb5..23e32ea420 100644
--- a/app/assets/javascripts/discourse/app/templates/components/share-popup.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/share-popup.hbs
@@ -4,13 +4,21 @@
   {{#if date}}
     <span class="date">{{displayDate}}</span>
   {{/if}}
+
+  {{d-button
+    action=(action "close")
+    class="btn btn-flat close"
+    icon="times"
+    aria-label="share.close"
+    title="share.close"
+  }}
 </div>
 
-<div>
-  <input type="text" aria-label={{i18n "share.url"}}>
+<div class="share-link-container">
+  <input class="share-link-input" type="text" aria-label={{i18n "share.url"}}> {{copy-button selector="input.share-link-input"}}
 </div>
 
-<div class="actions">
+<div class="share-link-actions">
   <div class="sources">
     {{#each sources as |s|}}
       {{share-source source=s title=model.title action=(action "share")}}
@@ -19,27 +27,26 @@
 
   <div class="alt-actions">
     {{#if topic.details.can_reply_as_new_topic}}
-      <div class="reply-as-new-topic">
-        {{#if topic.isPrivateMessage}}
-          <a href class="new-topic" {{action "replyAsNewTopic"}} aria-label={{i18n "post.reply_as_new_private_message"}} title={{i18n "post.reply_as_new_private_message"}}>
-            {{d-icon "plus"}}
-            {{i18n "user.new_private_message"}}
-          </a>
-        {{else}}
-          <a href class="new-topic" {{action "replyAsNewTopic"}} aria-label={{i18n "post.reply_as_new_topic"}} title={{i18n "post.reply_as_new_topic"}}>
-            {{d-icon "plus"}}
-            {{i18n "topic.create"}}
-          </a>
-        {{/if}}
-      </div>
+      {{#if topic.isPrivateMessage}}
+        {{d-button
+          action=(action "replyAsNewTopic")
+          class="btn btn-default new-topic"
+          icon="plus"
+          aria-label="post.reply_as_new_private_message"
+          title="post.reply_as_new_private_message"
+          label="user.new_private_message"
+        }}
+      {{else}}
+        {{d-button
+          action=(action "replyAsNewTopic")
+          class="btn btn-default new-topic"
+          icon="plus"
+          aria-label="post.reply_as_new_topic"
+          title="post.reply_as_new_topic"
+          label="topic.create"
+        }}
+      {{/if}}
     {{/if}}
 
-    {{d-button
-      action=(action "close")
-      class="btn btn-flat close"
-      icon="times"
-      aria-label="share.close"
-      title="share.close"
-    }}
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/share-source.hbs b/app/assets/javascripts/discourse/app/templates/components/share-source.hbs
index a2fdb3bf65..01e3edaa28 100644
--- a/app/assets/javascripts/discourse/app/templates/components/share-source.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/share-source.hbs
@@ -1 +1,7 @@
-{{d-button action=(action "share" source) class=(concat "share-" source.id) translatedTitle=source.title translatedAriaLabel=source.title icon=(if source.icon source.icon source.htmlIcon)}}
+{{d-button
+  action=(action "share" source)
+  class=(concat "btn-default share-" source.id)
+  translatedTitle=source.title
+  translatedAriaLabel=source.title
+  icon=(if source.icon source.icon source.htmlIcon)
+ }}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs b/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs
index 9063845f08..cc5b126958 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs
@@ -2,7 +2,7 @@
   <form>
     <div class="input-group invite-link">
       <label for="invite-link">{{i18n "user.invited.invite.instructions"}}</label>
-      <div class="invite-input-with-button">
+      <div class="share-link-container">
         {{input
           name="invite-link"
           class="invite-link"
@@ -19,7 +19,7 @@
 
     <div class="input-group input-email">
       <label for="invite-email">{{d-icon "envelope"}}{{i18n "user.invited.invite.restrict_email"}}</label>
-      <div class="invite-input-with-button">
+      <div class="invite-email-container">
         {{input
           id="invite-email"
           value=buffered.email
diff --git a/app/assets/javascripts/discourse/app/templates/modal/share-topic.hbs b/app/assets/javascripts/discourse/app/templates/modal/share-topic.hbs
index 7275238512..53cf997b9e 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/share-topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/share-topic.hbs
@@ -2,7 +2,7 @@
   <form>
     <div class="input-group invite-link">
       <label for="invite-link">{{i18n "topic.share.instructions"}}</label>
-      <div class="invite-input-with-button">
+      <div class="share-link-container">
         {{input
           name="invite-link"
           class="invite-link"
@@ -12,50 +12,51 @@
         {{copy-button selector="input.invite-link"}}
       </div>
     </div>
+    <div class="share-link-actions">
+      <div class="sources">
+        {{#each sources as |s|}}
+          {{share-source source=s title=topic.title action=(action "share")}}
+        {{/each}}
 
-    <div class="sources">
-      {{#each sources as |s|}}
-        {{share-source source=s title=topic.title action=(action "share")}}
-      {{/each}}
-
-      {{d-button
-        class="btn-default"
-        label="topic.share.notify_users.title"
-        icon="hand-point-right"
-        action=(action "toggleNotifyUsers")
-      }}
-
-      {{#if allowInvites}}
         {{d-button
           class="btn-default"
-          label="topic.share.invite_users"
-          icon="user-plus"
-          action=(action "inviteUsers")
+          label="topic.share.notify_users.title"
+          icon="hand-point-right"
+          action=(action "toggleNotifyUsers")
         }}
+
+        {{#if allowInvites}}
+          {{d-button
+            class="btn-default"
+            label="topic.share.invite_users"
+            icon="user-plus"
+            action=(action "inviteUsers")
+          }}
+        {{/if}}
+      </div>
+
+      {{#if showNotifyUsers}}
+        <div class="input-group invite-users">
+          <label for="invite-users">{{i18n "topic.share.notify_users.instructions"}}</label>
+          <div class="notify-user-input">
+            {{user-chooser
+              value=users
+              onChange=(action "onChangeUsers")
+              options=(hash
+                      topicId=topic.id
+                      maximum=(unless currentUser.staff 1)
+                      excludeCurrentUser=true
+                      )
+            }}
+            {{d-button
+              icon="check"
+              class="btn-primary"
+              disabled=(if users false true)
+              action=(action "notifyUsers")
+            }}
+          </div>
+        </div>
       {{/if}}
     </div>
-
-    {{#if showNotifyUsers}}
-      <div class="input-group invite-users">
-        <label for="invite-users">{{i18n "topic.share.notify_users.instructions"}}</label>
-        <div class="invite-input-with-button">
-          {{user-chooser
-            value=users
-            onChange=(action "onChangeUsers")
-            options=(hash
-                     topicId=topic.id
-                     maximum=(unless currentUser.staff 1)
-                     excludeCurrentUser=true
-                    )
-          }}
-          {{d-button
-            icon="check"
-            class="btn-primary"
-            disabled=(if users false true)
-            action=(action "notifyUsers")
-          }}
-        </div>
-      </div>
-    {{/if}}
   </form>
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/tests/acceptance/share-topic-test.js b/app/assets/javascripts/discourse/tests/acceptance/share-topic-test.js
index fd0b5c016d..fbec7395ef 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/share-topic-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/share-topic-test.js
@@ -30,7 +30,7 @@ acceptance("Share and Invite modal", function (needs) {
       "it shows the topic sharing url"
     );
 
-    assert.ok(count("button[class^='share-']") > 1, "it shows social sources");
+    assert.ok(count("button[class*='share-']") > 1, "it shows social sources");
 
     assert.ok(
       exists(".btn[aria-label='Notify']"),
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-test.js
index 49654926e8..421c5fdc34 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-test.js
@@ -40,7 +40,7 @@ acceptance("Topic", function (needs) {
   test("Reply as new topic", async function (assert) {
     await visit("/t/internationalization-localization/280");
     await click("button.share:nth-of-type(1)");
-    await click(".reply-as-new-topic a");
+    await click("button.new-topic");
 
     assert.ok(exists(".d-editor-input"), "the composer input is visible");
 
@@ -59,7 +59,7 @@ acceptance("Topic", function (needs) {
   test("Reply as new message", async function (assert) {
     await visit("/t/pm-for-testing/12");
     await click("button.share:nth-of-type(1)");
-    await click(".reply-as-new-topic a");
+    await click("button.new-topic");
 
     assert.ok(exists(".d-editor-input"), "the composer input is visible");
 
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index a74f4c1ecf..75ed4bf18d 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -838,166 +838,6 @@
   }
 }
 
-.create-invite-modal,
-.share-topic-modal {
-  .input-group {
-    margin-bottom: 0.5em;
-
-    &:last-child {
-      margin-bottom: 0;
-    }
-
-    input[type="text"] {
-      width: 100%;
-    }
-
-    textarea#invite-message,
-    &.invite-to-topic input[type="text"],
-    .group-chooser,
-    .user-chooser,
-    .future-date-input-selector {
-      width: 100%;
-    }
-
-    &.invite-to-topic input[type="radio"] {
-      margin-left: 10px;
-    }
-
-    label .d-icon {
-      color: var(--primary-medium);
-      margin-right: 10px;
-    }
-  }
-
-  .input-group input[type="text"],
-  .input-group .btn,
-  .user-chooser .select-kit-header,
-  .future-date-input .select-kit-header {
-    height: 34px;
-  }
-
-  .invite-input-with-button {
-    display: flex;
-
-    .btn {
-      margin-left: 3px;
-    }
-  }
-
-  .input-group.input-expires-at,
-  .input-group.input-email,
-  .input-group.invite-max-redemptions {
-    margin-bottom: 0;
-
-    input[type="text"] {
-      width: unset;
-    }
-  }
-
-  .future-date-input {
-    .date-picker-wrapper {
-      input {
-        margin: 0;
-      }
-    }
-
-    .control-group:nth-child(2),
-    .control-group:nth-child(3) {
-      display: inline-block;
-      margin-bottom: 0;
-      width: 49%;
-
-      input {
-        margin-bottom: 0;
-        width: 150px;
-      }
-    }
-  }
-
-  .input-group.input-email {
-    align-items: baseline;
-    display: flex;
-
-    label {
-      display: inline;
-    }
-
-    .invite-input-with-button {
-      display: inline-flex;
-      flex: 1;
-
-      input[type="text"] {
-        flex: 1;
-        margin-left: 5px;
-      }
-    }
-  }
-
-  .invite-max-redemptions {
-    label {
-      display: inline;
-    }
-
-    input {
-      width: 80px;
-    }
-  }
-
-  .invite-to-topic {
-    #choose-topic-title {
-      margin-bottom: 0;
-    }
-  }
-
-  .show-advanced {
-    margin-left: auto;
-    margin-right: 0;
-  }
-}
-
-.create-invite-modal {
-  .input-group {
-    textarea#invite-message,
-    &.invite-to-topic input[type="text"],
-    .group-chooser,
-    .user-chooser,
-    .future-date-input-selector {
-      margin-left: 25px;
-      width: calc(100% - 25px);
-    }
-  }
-}
-
-.share-topic-modal {
-  form {
-    margin-bottom: 0;
-  }
-  .sources {
-    display: flex;
-    flex-wrap: wrap;
-    align-items: stretch;
-    button {
-      margin-right: 0.5em;
-      margin-bottom: 0.5em;
-    }
-  }
-
-  .share-twitter {
-    .d-icon {
-      color: var(--twitter);
-    }
-  }
-  .share-facebook {
-    .d-icon {
-      color: var(--facebook);
-    }
-  }
-
-  .invite-users {
-    margin: 1em 0;
-  }
-}
-
 .group-add-members-modal {
   .input-group {
     margin-bottom: 0.5em;
diff --git a/app/assets/stylesheets/common/base/share_link.scss b/app/assets/stylesheets/common/base/share_link.scss
index 4fbc56ff9e..4dcb731b64 100644
--- a/app/assets/stylesheets/common/base/share_link.scss
+++ b/app/assets/stylesheets/common/base/share_link.scss
@@ -1,26 +1,80 @@
-// styles that apply to the "share" popup when sharing a link to a post or topic
+// styles that apply to the "share" modal & popup when sharing a link to a post or topic
+
+.share-link-container {
+  display: flex;
+  button {
+    transition-property: background-color, color; // don't transition outline
+  }
+  input {
+    width: 100%;
+    font-size: var(--font-up-1);
+    margin-bottom: 0;
+    &:focus + button {
+      outline: 1px solid var(--tertiary);
+    }
+  }
+}
+
+.share-link-actions {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+
+  button {
+    margin-top: 0.5em;
+    margin-right: 0.5em;
+  }
+
+  .sources {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+  }
+
+  .new-topic {
+    margin-right: 0;
+  }
+
+  .alt-actions {
+    display: flex;
+    justify-content: flex-end;
+    margin-left: auto;
+  }
+}
+
+.share-twitter {
+  .d-icon {
+    color: var(--twitter);
+  }
+}
+.share-facebook {
+  .d-icon {
+    color: var(--facebook);
+  }
+}
+
+// post share popup
 
 #share-link {
   position: absolute;
-  left: 20px;
   z-index: z("dropdown");
   box-shadow: shadow("card");
   background-color: var(--secondary);
-  padding: 8px 8px 4px 8px;
+  padding: 0.5em;
   width: 300px;
   display: none;
   &.visible {
     display: block;
   }
+
   input[type="text"] {
     width: 100%;
   }
 
   .title {
-    margin-bottom: 4px;
+    margin-bottom: 0.5em;
     align-items: center;
     display: flex;
-    justify-content: space-between;
 
     h3 {
       font-size: $font-0;
@@ -30,74 +84,166 @@
     .date {
       font-weight: normal;
       color: var(--primary-med-or-secondary-med);
-    }
-  }
-
-  .copy-text {
-    display: inline-block;
-    position: absolute;
-    margin: 5px 5px 5px 15px;
-    color: var(--success);
-    opacity: 1;
-    transition: opacity 0.25s;
-    font-size: $font-0;
-    &:not(.success) {
-      opacity: 0;
-    }
-  }
-  .social-link {
-    margin-right: 8px;
-    font-size: $font-up-4;
-    .d-icon {
-      color: var(--tertiary-or-white);
-    }
-    .d-icon-fab-facebook {
-      // Adheres to Facebook brand guidelines
-      color: var(--facebook-or-white);
-    }
-    .d-icon-fab-twitter-square {
-      // Adheres to Twitter brand guidelines
-      color: var(--twitter-or-white);
-    }
-  }
-
-  input[type="text"] {
-    font-size: $font-up-1;
-    margin-bottom: 0;
-  }
-
-  .actions {
-    display: flex;
-    align-items: flex-end;
-    margin-top: 8px;
-
-    .sources {
-      display: flex;
-      align-items: center;
-      flex-wrap: wrap;
-      flex-direction: row;
-      max-width: 45%;
-
-      .social-link {
-        margin-right: 8px;
-      }
+      margin-left: 0.5em;
     }
 
-    .alt-actions {
-      display: flex;
-      align-items: center;
-      flex: 1;
-      justify-content: flex-end;
-      height: 36px;
-
-      .close-share {
-        font-size: $font-up-3;
-        color: var(--primary-med-or-secondary-med);
-      }
-
-      .new-topic {
-        margin-right: 16px;
-      }
+    .btn.close {
+      margin-left: auto;
+    }
+  }
+}
+
+// topic share modal
+
+.share-topic-modal {
+  form {
+    margin-bottom: 0;
+  }
+
+  .invite-users {
+    display: flex;
+    flex-direction: column;
+    margin: 1.5em 0 0.25em;
+    width: 100%;
+
+    button {
+      margin-top: 0;
+      margin-right: 0;
+    }
+  }
+}
+
+.notify-user-input {
+  display: flex;
+  align-items: stretch;
+
+  .select-kit {
+    width: 100%;
+  }
+
+  .multi-select-header {
+    width: 100%;
+  }
+
+  .select-kit.multi-select .choices {
+    padding: 0;
+  }
+
+  .select-kit.multi-select.is-expanded + button {
+    outline: 1px solid var(--tertiary); // outline the button when the input is outlined, to match height
+  }
+}
+
+// topic invite modal
+
+.create-invite-modal {
+  form {
+    margin: 0;
+    input[type="text"],
+    .btn,
+    .select-kit-header {
+      height: 2.27rem;
+    }
+  }
+
+  input {
+    margin-bottom: 0;
+  }
+
+  label {
+    margin-right: 0.5em;
+    .d-icon {
+      color: var(--primary-medium);
+      margin-right: 0.75em;
+    }
+  }
+
+  textarea {
+    margin-bottom: 0;
+  }
+
+  .input-group:not(:last-of-type) {
+    margin-bottom: 1em;
+  }
+  .input-group.input-expires-at,
+  .input-group.input-email,
+  .input-group.invite-max-redemptions {
+    input[type="text"] {
+      width: unset;
+    }
+  }
+
+  .existing-topic,
+  p {
+    // p is for "no topics found"
+    margin-left: 1.75em;
+    margin-top: 0.25em;
+  }
+
+  .future-date-input {
+    display: grid;
+    grid-template-columns: auto 1fr;
+
+    .control-group:nth-child(1) {
+      grid-column-start: 1;
+      grid-column-end: 3;
+    }
+    .control-group:nth-child(2) {
+      margin-left: 1.75em;
+      margin-right: 1.5em;
+    }
+    .control-group:nth-child(2),
+    .control-group:nth-child(3) {
+      grid-row-start: 2;
+      display: inline-flex;
+      align-items: center;
+      margin-bottom: 0;
+      input {
+        height: 100%;
+        margin-bottom: 0;
+        margin-left: 0.5em;
+        width: 150px;
+      }
+    }
+  }
+
+  .input-group.input-email {
+    display: flex;
+    align-items: baseline;
+    label {
+      display: inline;
+    }
+  }
+
+  .invite-email-container {
+    flex: 1 1 auto;
+    #invite-email {
+      width: 100%;
+    }
+  }
+
+  .invite-max-redemptions {
+    label {
+      display: inline;
+    }
+    input {
+      width: 80px;
+    }
+  }
+
+  .show-advanced {
+    margin-left: auto;
+    margin-right: 0;
+  }
+
+  .input-group {
+    textarea#invite-message,
+    &.invite-to-topic input[type="text"],
+    .group-chooser,
+    .user-chooser,
+    .future-date-input-selector {
+      margin-left: 1.75em;
+      width: calc(100% - 1.75em);
     }
   }
 }

From a1047f5ef466cffeead9f11a40f487f4d6360eca Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 19 Jul 2021 13:54:19 +0800
Subject: [PATCH 29/77] FEATURE: Add new plugin API to allow plugins to extend
 `Site#categories` (#13773)

---
 app/models/site.rb                      | 13 +++++++++++++
 lib/plugin/instance.rb                  | 11 +++++++++++
 spec/components/plugin/instance_spec.rb | 21 +++++++++++++++++++++
 3 files changed, 45 insertions(+)

diff --git a/app/models/site.rb b/app/models/site.rb
index 338091faee..4874009819 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -7,6 +7,14 @@ class Site
   cattr_accessor :preloaded_category_custom_fields
   self.preloaded_category_custom_fields = Set.new
 
+  def self.add_categories_callbacks(&block)
+    categories_callbacks << block
+  end
+
+  def self.categories_callbacks
+    @categories_callbacks ||= []
+  end
+
   def initialize(guardian)
     @guardian = guardian
   end
@@ -104,6 +112,11 @@ class Site
       end
 
       categories.reject! { |c| c[:parent_category_id] && !by_id[c[:parent_category_id]] }
+
+      self.class.categories_callbacks.each do |callback|
+        callback.call(categories)
+      end
+
       categories
     end
   end
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 646603effc..de1c8331db 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -231,6 +231,17 @@ class Plugin::Instance
     DiscoursePluginRegistry.register_topic_thumbnail_size(size, self)
   end
 
+  # Register a callback to add custom payload to Site#categories
+  # Example usage:
+  #   register_site_categories_callback do |categories|
+  #     categories.each do |category|
+  #       category[:some_field] = 'test'
+  #     end
+  #   end
+  def register_site_categories_callback(&block)
+    Site.add_categories_callbacks(&block)
+  end
+
   def custom_avatar_column(column)
     reloadable_patch do |plugin|
       UserLookup.lookup_columns << column
diff --git a/spec/components/plugin/instance_spec.rb b/spec/components/plugin/instance_spec.rb
index 171e8c94b5..bdd1c835da 100644
--- a/spec/components/plugin/instance_spec.rb
+++ b/spec/components/plugin/instance_spec.rb
@@ -647,4 +647,25 @@ describe Plugin::Instance do
       }.to raise_error(RuntimeError)
     end
   end
+
+  describe '#register_site_categories_callback' do
+    fab!(:category) { Fabricate(:category) }
+
+    it 'adds a callback to the Site#categories' do
+      instance = Plugin::Instance.new
+
+      instance.register_site_categories_callback do |categories|
+        categories.each do |category|
+          category[:test_field] = "test"
+        end
+      end
+
+      site = Site.new(Guardian.new)
+
+      expect(site.categories.first[:test_field]).to eq("test")
+    ensure
+      Site.clear_cache
+      Site.categories_callbacks.clear
+    end
+  end
 end

From 1472e47aae5bfdfb6fd9abfe89beb186c751f514 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Mon, 19 Jul 2021 14:59:05 +0800
Subject: [PATCH 30/77] FIX: Remove hardcoded value when displaying incoming
 messages count. (#13774)

Follow-up to 902d0e1e3a61bc2d2d05c617a6e8e51aaaf42b30.
---
 .../discourse/app/templates/components/basic-topic-list.hbs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/templates/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/app/templates/components/basic-topic-list.hbs
index ed237acd6d..a715b2268b 100644
--- a/app/assets/javascripts/discourse/app/templates/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/basic-topic-list.hbs
@@ -2,7 +2,7 @@
   {{#if hasIncoming}}
     <div class="show-mores">
       <a tabindex="0" href {{action showInserted}} class="alert alert-info clickable">
-        {{count-i18n key="topic_count_" suffix="latest" count=2}}
+        {{count-i18n key="topic_count_" suffix="latest" count=incomingCount}}
       </a>
     </div>
   {{/if}}

From 5f7e60d9dc25f8bd9b53e925d49ad3eeae4760e3 Mon Sep 17 00:00:00 2001
From: Michael Brown <michael.brown@discourse.org>
Date: Mon, 19 Jul 2021 11:35:47 -0400
Subject: [PATCH 31/77] discourse/discourse change from 'master' to 'main'

---
 README.md                                     |  6 ++---
 .../discourse/tests/fixtures/topic.js         | 24 +++++++++----------
 config/locales/server.en.yml                  |  4 ++--
 docs/ADMIN-QUICK-START-GUIDE.md               |  8 +++----
 docs/INSTALL-cloud.md                         |  4 ++--
 docs/INSTALL-email.md                         |  2 +-
 docs/INSTALL.md                               |  4 ++--
 docs/PLUGINS.md                               |  3 +--
 docs/SECURITY.md                              |  4 ++--
 .../plugin/templates/javascript.js.es6.erb    |  2 +-
 lib/generators/plugin/templates/plugin.rb.erb |  2 +-
 plugins/discourse-details/plugin.rb           |  2 +-
 plugins/discourse-narrative-bot/plugin.rb     |  2 +-
 plugins/discourse-presence/plugin.rb          |  2 +-
 plugins/lazy-yt/plugin.rb                     |  2 +-
 plugins/poll/plugin.rb                        |  2 +-
 16 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/README.md b/README.md
index 1bb39f2f5c..7aeac47e06 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ Discourse supports the **latest, stable releases** of all major browsers and pla
 - [Redis](https://redis.io/) &mdash; We use Redis as a cache and for transient data.
 - [BrowserStack](https://www.browserstack.com/) &mdash; We use BrowserStack to test on real devices and browsers.
 
-Plus *lots* of Ruby Gems, a complete list of which is at [/master/Gemfile](https://github.com/discourse/discourse/blob/master/Gemfile).
+Plus *lots* of Ruby Gems, a complete list of which is at [/main/Gemfile](https://github.com/discourse/discourse/blob/main/Gemfile).
 
 ## Contributing
 
@@ -80,7 +80,7 @@ Before contributing to Discourse:
 1. Please read the complete mission statements on [**discourse.org**](https://www.discourse.org). Yes we actually believe this stuff; you should too.
 2. Read and sign the [**Electronic Discourse Forums Contribution License Agreement**](https://www.discourse.org/cla).
 3. Dig into [**CONTRIBUTING.MD**](CONTRIBUTING.md), which covers submitting bugs, requesting new features, preparing your code for a pull request, etc.
-4. Always strive to collaborate [with mutual respect](https://github.com/discourse/discourse/blob/master/docs/code-of-conduct.md).
+4. Always strive to collaborate [with mutual respect](https://github.com/discourse/discourse/blob/main/docs/code-of-conduct.md).
 5. Not sure what to work on? [**We've got some ideas.**](https://meta.discourse.org/t/so-you-want-to-help-out-with-discourse/3823)
 
 
@@ -88,7 +88,7 @@ We look forward to seeing your pull requests!
 
 ## Security
 
-We take security very seriously at Discourse; all our code is 100% open source and peer reviewed. Please read [our security guide](https://github.com/discourse/discourse/blob/master/docs/SECURITY.md) for an overview of security measures in Discourse, or if you wish to report a security issue.
+We take security very seriously at Discourse; all our code is 100% open source and peer reviewed. Please read [our security guide](https://github.com/discourse/discourse/blob/main/docs/SECURITY.md) for an overview of security measures in Discourse, or if you wish to report a security issue.
 
 ## The Discourse Team
 
diff --git a/app/assets/javascripts/discourse/tests/fixtures/topic.js b/app/assets/javascripts/discourse/tests/fixtures/topic.js
index cf9740bba8..b2cde97a0d 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/topic.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/topic.js
@@ -377,7 +377,7 @@ export default {
           uploaded_avatar_id: 40181,
           created_at: "2013-02-05T21:32:47.649Z",
           cooked:
-            '<p>The application strings <a href="https://github.com/discourse/discourse/blob/master/config/locales/en.yml" rel="nofollow">are externalized</a>, so localization should be entirely possible with enough translation effort.</p><p>Link for unknown-test: <a href="/c/category-does-not-exist/99999" data-for-test="category-404">link</a></p>',
+            '<p>The application strings <a href="https://github.com/discourse/discourse/blob/main/config/locales/en.yml" rel="nofollow">are externalized</a>, so localization should be entirely possible with enough translation effort.</p><p>Link for unknown-test: <a href="/c/category-does-not-exist/99999" data-for-test="category-404">link</a></p>',
           post_number: 2,
           post_type: 1,
           updated_at: "2013-02-06T10:15:27.965Z",
@@ -400,7 +400,7 @@ export default {
           link_counts: [
             {
               url:
-                "https://github.com/discourse/discourse/blob/master/config/locales/en.yml",
+                "https://github.com/discourse/discourse/blob/main/config/locales/en.yml",
               internal: false,
               reflection: false,
               clicks: 118,
@@ -473,7 +473,7 @@ export default {
           uploaded_avatar_id: 5297,
           created_at: "2013-02-06T02:26:24.922Z",
           cooked:
-            '<p>Yep, all strings are going through a lookup table.*</p>\n\n<p><a href="https://github.com/discourse/discourse/blob/master/config/locales">master/config/locales</a></p>\n\n<p>So you could replace that lookup table with the "de" one to get German.</p>\n\n<p><sub>* we didn\'t get all the strings into the lookup table for launch, but the vast, vast majority of them are and the ones that are not, we will fix as we go!</sub></p>',
+            '<p>Yep, all strings are going through a lookup table.*</p>\n\n<p><a href="https://github.com/discourse/discourse/blob/main/config/locales">master/config/locales</a></p>\n\n<p>So you could replace that lookup table with the "de" one to get German.</p>\n\n<p><sub>* we didn\'t get all the strings into the lookup table for launch, but the vast, vast majority of them are and the ones that are not, we will fix as we go!</sub></p>',
           post_number: 3,
           post_type: 1,
           updated_at: "2014-02-24T05:23:39.211Z",
@@ -496,7 +496,7 @@ export default {
           link_counts: [
             {
               url:
-                "https://github.com/discourse/discourse/blob/master/config/locales",
+                "https://github.com/discourse/discourse/blob/main/config/locales",
               internal: false,
               reflection: false,
               title:
@@ -2405,7 +2405,7 @@ export default {
       links: [
         {
           url:
-            "https://github.com/discourse/discourse/blob/master/config/locales/en.yml",
+            "https://github.com/discourse/discourse/blob/main/config/locales/en.yml",
           title: null,
           fancy_title: null,
           internal: false,
@@ -2438,7 +2438,7 @@ export default {
         },
         {
           url:
-            "https://github.com/discourse/discourse/blob/master/config/locales",
+            "https://github.com/discourse/discourse/blob/main/config/locales",
           title:
             "discourse/config/locales at master · discourse/discourse · GitHub",
           fancy_title: null,
@@ -2521,7 +2521,7 @@ export default {
         },
         {
           url:
-            "https://github.com/discourse/discourse/tree/master/config/locales",
+            "https://github.com/discourse/discourse/tree/main/config/locales",
           title:
             "discourse/config/locales at master · discourse/discourse · GitHub",
           fancy_title: null,
@@ -2566,7 +2566,7 @@ export default {
         },
         {
           url:
-            "https://github.com/discourse/discourse/blob/master/config/locales/client.en.yml#L691",
+            "https://github.com/discourse/discourse/blob/main/config/locales/client.en.yml#L691",
           title:
             "discourse/config/locales/client.en.yml at master · discourse/discourse · GitHub",
           fancy_title: null,
@@ -2588,7 +2588,7 @@ export default {
         },
         {
           url:
-            "https://github.com/discourse/discourse/blob/master/config/locales/client.nl.yml",
+            "https://github.com/discourse/discourse/blob/main/config/locales/client.nl.yml",
           title:
             "discourse/config/locales/client.nl.yml at master · discourse/discourse · GitHub",
           fancy_title: null,
@@ -2820,7 +2820,7 @@ export default {
         },
         {
           url:
-            "https://github.com/discourse/discourse/blob/master/app/assets/javascripts/locales/date_locales.js",
+            "https://github.com/discourse/discourse/blob/main/app/assets/javascripts/locales/date_locales.js",
           title: null,
           fancy_title: null,
           internal: false,
@@ -2885,7 +2885,7 @@ export default {
         },
         {
           url:
-            "https://github.com/discourse/discourse/blob/master/config/locales/client.de.yml",
+            "https://github.com/discourse/discourse/blob/main/config/locales/client.de.yml",
           title:
             "discourse/config/locales/client.de.yml at master · discourse/discourse · GitHub",
           fancy_title: null,
@@ -2919,7 +2919,7 @@ export default {
         },
         {
           url:
-            "https://github.com/discourse/discourse/blob/master/config/locales/server.de.yml",
+            "https://github.com/discourse/discourse/blob/main/config/locales/server.de.yml",
           title:
             "discourse/config/locales/server.de.yml at master · discourse/discourse · GitHub",
           fancy_title: null,
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index f083054b1a..1978fe5241 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2789,7 +2789,7 @@ en:
 
       - Upgrade using our easy **[one-click browser upgrade](%{base_url}/admin/upgrade)**
 
-      - See what's new in the [release notes](https://meta.discourse.org/tag/release-notes) or view the [raw GitHub changelog](https://github.com/discourse/discourse/commits/master)
+      - See what's new in the [release notes](https://meta.discourse.org/tag/release-notes) or view the [raw GitHub changelog](https://github.com/discourse/discourse/commits/main)
 
       - Visit [meta.discourse.org](https://meta.discourse.org) for news, discussion, and support for Discourse
 
@@ -2804,7 +2804,7 @@ en:
 
       - Upgrade using our easy **[one-click browser upgrade](%{base_url}/admin/upgrade)**
 
-      - See what's new in the [release notes](https://meta.discourse.org/tag/release-notes) or view the [raw GitHub changelog](https://github.com/discourse/discourse/commits/master)
+      - See what's new in the [release notes](https://meta.discourse.org/tag/release-notes) or view the [raw GitHub changelog](https://github.com/discourse/discourse/commits/main)
 
       - Visit [meta.discourse.org](https://meta.discourse.org) for news, discussion, and support for Discourse
 
diff --git a/docs/ADMIN-QUICK-START-GUIDE.md b/docs/ADMIN-QUICK-START-GUIDE.md
index 3b030b1d89..a6442931bf 100644
--- a/docs/ADMIN-QUICK-START-GUIDE.md
+++ b/docs/ADMIN-QUICK-START-GUIDE.md
@@ -42,7 +42,7 @@ Email is required for new account signups and notifications. **Test your email t
 
 - You got the test email? Great! **Read that email closely**, it has important email deliverability tips.
 - You didn't get the test email? This means your users probably aren't getting any signup or notification emails either.
-- Email deliverability can be hard. Read [**Email Service Configuration**](https://github.com/discourse/discourse/blob/master/docs/INSTALL-email.md).
+- Email deliverability can be hard. Read [**Email Service Configuration**](https://github.com/discourse/discourse/blob/main/docs/INSTALL-email.md).
 
 If you'd like to enable *replying* to topics via email, [see this howto](https://meta.discourse.org/t/set-up-reply-via-email-support/14003).
 
@@ -117,7 +117,7 @@ The invite area on your profile page also includes advanced Staff methods of [se
 
 - One CPU and 1GB of memory, with swap, is the minimum for a basic Discourse community. As your community grows you may need more memory or CPU resources.
 
-- [Our Docker container install](https://github.com/discourse/discourse/blob/master/docs/INSTALL.md) is the only one we officially support. It guarantees easy updates, and all recommended optimizations from the Discourse team.
+- [Our Docker container install](https://github.com/discourse/discourse/blob/main/docs/INSTALL.md) is the only one we officially support. It guarantees easy updates, and all recommended optimizations from the Discourse team.
 
 - You should get an email notification when new versions of Discourse are released. To update your instance via our easy one click upgrade process, visit [/admin/upgrade](/admin/upgrade).
 
@@ -129,7 +129,7 @@ The invite area on your profile page also includes advanced Staff methods of [se
    - [Import and Export your data](https://meta.discourse.org/t/move-your-discourse-instance-to-a-different-server/15721)
    - [Change the domain name](https://meta.discourse.org/t/how-do-i-change-the-domain-name/16098)
    - [Multiple Discourse instances on the same server](https://meta.discourse.org/t/multisite-configuration-with-docker/14084)
-   - [Import old content from vBulletin, PHPbb, Vanilla, Drupal, BBPress, etc](https://github.com/discourse/discourse/tree/master/script/import_scripts)
+   - [Import old content from vBulletin, PHPbb, Vanilla, Drupal, BBPress, etc](https://github.com/discourse/discourse/tree/main/script/import_scripts)
    - A firewall on your server? [Configure firewall](https://meta.discourse.org/t/configure-a-firewall-for-discourse/20584).
    - A user friendly [offline page when rebuilding or upgrading?](https://meta.discourse.org/t/adding-an-offline-page-when-rebuilding/45238)
    - Embed Discourse [in your WordPress install](https://github.com/discourse/wp-discourse), or [on your static HTML site](https://meta.discourse.org/t/embedding-discourse-comments-via-javascript/31963)
@@ -140,4 +140,4 @@ For more assistance on configuring and running your Discourse forum, see [meta.d
 
 ----
 
-Have suggestions to improve or update this guide? Submit a [pull request](https://github.com/discourse/discourse/blob/master/docs/ADMIN-QUICK-START-GUIDE.md).
+Have suggestions to improve or update this guide? Submit a [pull request](https://github.com/discourse/discourse/blob/main/docs/ADMIN-QUICK-START-GUIDE.md).
diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md
index 1abecc2db6..540fda784f 100644
--- a/docs/INSTALL-cloud.md
+++ b/docs/INSTALL-cloud.md
@@ -152,7 +152,7 @@ Do you want...
 
 - A Content Delivery Network to speed up worldwide access? [Configure a CDN](https://meta.discourse.org/t/enable-a-cdn-for-your-discourse/14857). We recommend [Fastly](http://www.fastly.com/).
 
-- Import old content from vBulletin, PHPbb, Vanilla, Drupal, BBPress, etc? [See our open source importers](https://github.com/discourse/discourse/tree/master/script/import_scripts).
+- Import old content from vBulletin, PHPbb, Vanilla, Drupal, BBPress, etc? [See our open source importers](https://github.com/discourse/discourse/tree/main/script/import_scripts).
 
 - A user friendly [offline page when rebuilding or upgrading?](https://meta.discourse.org/t/adding-an-offline-page-when-rebuilding/45238)
 
@@ -165,4 +165,4 @@ Help us improve this guide! Feel free to ask about it on [meta.discourse.org][me
  [meta]: https://meta.discourse.org
    [do]: https://www.digitalocean.com/?refcode=5fa48ac82415
   [put]: http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html
-  [mailconfig]: https://github.com/discourse/discourse/blob/master/docs/INSTALL-email.md
+  [mailconfig]: https://github.com/discourse/discourse/blob/main/docs/INSTALL-email.md
diff --git a/docs/INSTALL-email.md b/docs/INSTALL-email.md
index bc4a8bf570..be2d478147 100644
--- a/docs/INSTALL-email.md
+++ b/docs/INSTALL-email.md
@@ -8,7 +8,7 @@ _The pricing information is included as a courtesy, and may be out of date. Disc
 
 **Please note that in any email provider, you _must_ verify and use the subdomain, e.g. `discourse.example.com`. If you verify the domain only, e.g. `example.com`, mail will not be configured correctly.**
 
-Enter these values when prompted by `./discourse-setup` per the [install guide](https://github.com/discourse/discourse/blob/master/docs/INSTALL-cloud.md#edit-discourse-configuration). To change the current email service, run `./discourse-setup` as well (this will bring the forum offline for a few minutes while it gets rebuilt).
+Enter these values when prompted by `./discourse-setup` per the [install guide](https://github.com/discourse/discourse/blob/main/docs/INSTALL-cloud.md#edit-discourse-configuration). To change the current email service, run `./discourse-setup` as well (this will bring the forum offline for a few minutes while it gets rebuilt).
 
 #### [Mailgun][gun] &mdash; 5k emails/month on a 3 month trial
 
diff --git a/docs/INSTALL.md b/docs/INSTALL.md
index cc386d25c6..052ea90b31 100644
--- a/docs/INSTALL.md
+++ b/docs/INSTALL.md
@@ -27,8 +27,8 @@ Hosting Rails applications is complicated. Even if you already have Postgres, Re
 
 ## Security
 
-We take security very seriously at Discourse, and all our code is 100% open source and peer reviewed. Please read [our security guide](https://github.com/discourse/discourse/blob/master/docs/SECURITY.md) for an overview of security measures in Discourse.
+We take security very seriously at Discourse, and all our code is 100% open source and peer reviewed. Please read [our security guide](https://github.com/discourse/discourse/blob/main/docs/SECURITY.md) for an overview of security measures in Discourse.
 
-[basic]: https://github.com/discourse/discourse/blob/master/docs/INSTALL-cloud.md
+[basic]: https://github.com/discourse/discourse/blob/main/docs/INSTALL-cloud.md
 [advanced]: https://github.com/discourse/discourse_docker
 [swap]: https://meta.discourse.org/t/create-a-swapfile-for-your-linux-server/13880
diff --git a/docs/PLUGINS.md b/docs/PLUGINS.md
index 8cf2d332c7..16d67eb7d4 100644
--- a/docs/PLUGINS.md
+++ b/docs/PLUGINS.md
@@ -3,7 +3,7 @@
 
 If you just want to get some plugins for your Discourse instance, check out [the plugin category](https://meta.discourse.org/c/plugin) at meta. This is the most up to date place for plugin discussion and listing.
 
-If you want to be safe, use only plugins on this list of [Official Plugins](https://github.com/discourse/discourse/blob/master/lib/plugin/metadata.rb): 
+If you want to be safe, use only plugins on this list of [Official Plugins](https://github.com/discourse/discourse/blob/main/lib/plugin/metadata.rb): 
 
 ### Discourse Plugin Tutorials
 
@@ -24,4 +24,3 @@ If you want to be safe, use only plugins on this list of [Official Plugins](http
 - [Manipulating text in the composer](https://meta.discourse.org/t/plugin-tutorial-1-how-to-manipulate-the-text-in-the-composer/10925)
  
 - [Display plugin outlet locations](https://meta.discourse.org/t/plugin-outlet-locations/29589)
-
diff --git a/docs/SECURITY.md b/docs/SECURITY.md
index 29225d0c3e..465c87b392 100644
--- a/docs/SECURITY.md
+++ b/docs/SECURITY.md
@@ -29,7 +29,7 @@ There are 3 main scenarios we protect against:
 
 3. **CSP is on by default** for [all Discourse installations](https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243) as of Discourse 2.2. It can be switched off in the site settings, but it is default on.
 
-On the server side we run a allowlist based sanitizer, implemented using the [Sanitize gem](https://github.com/rgrove/sanitize). See the [relevant Discourse code](https://github.com/discourse/discourse/blob/master/lib/pretty_text.rb).
+On the server side we run a allowlist based sanitizer, implemented using the [Sanitize gem](https://github.com/rgrove/sanitize). See the [relevant Discourse code](https://github.com/discourse/discourse/blob/main/lib/pretty_text.rb).
 
 In addition, titles and all other places where non-admins can enter code are protected either using the Handlebars library or standard Rails XSS protection.
 
@@ -53,4 +53,4 @@ If you install via our recommended Docker image in our [install guide][ig], ngin
 
 We strongly recommend that the various Discourse processes (web server, sidekiq) run under a non-elevated account. This is handled automatically if you install via our recommended Docker image -- see [our install guide][ig] for details.
 
-[ig]: https://github.com/discourse/discourse/blob/master/docs/INSTALL.md
+[ig]: https://github.com/discourse/discourse/blob/main/docs/INSTALL.md
diff --git a/lib/generators/plugin/templates/javascript.js.es6.erb b/lib/generators/plugin/templates/javascript.js.es6.erb
index 5be3cfc104..bd73e7175e 100644
--- a/lib/generators/plugin/templates/javascript.js.es6.erb
+++ b/lib/generators/plugin/templates/javascript.js.es6.erb
@@ -1,7 +1,7 @@
 import { withPluginApi } from "discourse/lib/plugin-api";
 
 function initialize<%= classified_name %>(api) {
-  // https://github.com/discourse/discourse/blob/master/app/assets/javascripts/discourse/lib/plugin-api.js.es6
+  // https://github.com/discourse/discourse/blob/main/app/assets/javascripts/discourse/lib/plugin-api.js.es6
 }
 
 export default {
diff --git a/lib/generators/plugin/templates/plugin.rb.erb b/lib/generators/plugin/templates/plugin.rb.erb
index f18caa3ad2..aa33a6aa55 100644
--- a/lib/generators/plugin/templates/plugin.rb.erb
+++ b/lib/generators/plugin/templates/plugin.rb.erb
@@ -17,5 +17,5 @@ PLUGIN_NAME ||= '<%= classified_name %>'
 load File.expand_path('lib/<%= dasherized_name %>/engine.rb', __dir__)
 
 after_initialize do
-  # https://github.com/discourse/discourse/blob/master/lib/plugin/instance.rb
+  # https://github.com/discourse/discourse/blob/main/lib/plugin/instance.rb
 end
diff --git a/plugins/discourse-details/plugin.rb b/plugins/discourse-details/plugin.rb
index 6d3d1efb51..130bd58a32 100644
--- a/plugins/discourse-details/plugin.rb
+++ b/plugins/discourse-details/plugin.rb
@@ -4,7 +4,7 @@
 # about: HTML5.1 Details polyfill for Discourse
 # version: 0.4
 # authors: Régis Hanol
-# url: https://github.com/discourse/discourse/tree/master/plugins/discourse-details
+# url: https://github.com/discourse/discourse/tree/main/plugins/discourse-details
 
 enabled_site_setting :details_enabled
 hide_plugin if self.respond_to?(:hide_plugin)
diff --git a/plugins/discourse-narrative-bot/plugin.rb b/plugins/discourse-narrative-bot/plugin.rb
index 52af84d12a..5bda9a65ea 100644
--- a/plugins/discourse-narrative-bot/plugin.rb
+++ b/plugins/discourse-narrative-bot/plugin.rb
@@ -4,7 +4,7 @@
 # about: Introduces staff to Discourse
 # version: 1.0
 # authors: Nick Sahler, Alan Tan
-# url: https://github.com/discourse/discourse/tree/master/plugins/discourse-narrative-bot
+# url: https://github.com/discourse/discourse/tree/main/plugins/discourse-narrative-bot
 
 enabled_site_setting :discourse_narrative_bot_enabled
 hide_plugin if self.respond_to?(:hide_plugin)
diff --git a/plugins/discourse-presence/plugin.rb b/plugins/discourse-presence/plugin.rb
index 34eb342986..a61d97ee80 100644
--- a/plugins/discourse-presence/plugin.rb
+++ b/plugins/discourse-presence/plugin.rb
@@ -4,7 +4,7 @@
 # about: Show which users are writing a reply to a topic
 # version: 2.0
 # authors: André Pereira, David Taylor, tgxworld
-# url: https://github.com/discourse/discourse/tree/master/plugins/discourse-presence
+# url: https://github.com/discourse/discourse/tree/main/plugins/discourse-presence
 
 enabled_site_setting :presence_enabled
 hide_plugin if self.respond_to?(:hide_plugin)
diff --git a/plugins/lazy-yt/plugin.rb b/plugins/lazy-yt/plugin.rb
index bdc3ea4a03..1025fdfd95 100644
--- a/plugins/lazy-yt/plugin.rb
+++ b/plugins/lazy-yt/plugin.rb
@@ -4,7 +4,7 @@
 # about: Uses the lazyYT plugin to lazy load Youtube videos
 # version: 1.0.1
 # authors: Arpit Jalan
-# url: https://github.com/discourse/discourse/tree/master/plugins/lazy-yt
+# url: https://github.com/discourse/discourse/tree/main/plugins/lazy-yt
 # transpile_js: true
 
 hide_plugin if self.respond_to?(:hide_plugin)
diff --git a/plugins/poll/plugin.rb b/plugins/poll/plugin.rb
index fd428ab99f..8965d9ca00 100644
--- a/plugins/poll/plugin.rb
+++ b/plugins/poll/plugin.rb
@@ -4,7 +4,7 @@
 # about: Official poll plugin for Discourse
 # version: 1.0
 # authors: Vikhyat Korrapati (vikhyat), Régis Hanol (zogstrip)
-# url: https://github.com/discourse/discourse/tree/master/plugins/poll
+# url: https://github.com/discourse/discourse/tree/main/plugins/poll
 
 register_asset "stylesheets/common/poll.scss"
 register_asset "stylesheets/common/poll-ui-builder.scss"

From aa12d12c0be4821928f68338558964fdad35ff4c Mon Sep 17 00:00:00 2001
From: Michael Brown <michael.brown@discourse.org>
Date: Mon, 19 Jul 2021 11:25:44 -0400
Subject: [PATCH 32/77] discourse/discourse change from 'master' to 'main':
 update fixture data

---
 .../tests/fixtures/search-fixtures.js         |   6 +-
 .../githubfolder-discourse-root.response      | 120 +++++++++---------
 spec/fixtures/onebox/githubfolder.response    |  68 +++++-----
 .../engine/github_folder_onebox_spec.rb       |   6 +-
 4 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/app/assets/javascripts/discourse/tests/fixtures/search-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/search-fixtures.js
index 0ece7ac630..84e7424046 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/search-fixtures.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/search-fixtures.js
@@ -159,7 +159,7 @@ export default {
         uploaded_avatar_id: 3281,
         created_at: "2014-04-12T22:22:07.930Z",
         cooked:
-          '<p>So you want to set up Discourse on Ubuntu to hack on and develop with?</p>\n\n<p>We\'ll assume that you don\'t have Ruby/Rails/Postgre/Redis installed on your Ubuntu system. Let\'s begin!</p>\n\n<p><em>Although this guide assumes that you are using Ubuntu, but the set-up instructions will work fine for any Debian based distribution.</em></p>\n\n<p><em>(If you want to install Discourse for production use, see <a href="https://github.com/discourse/discourse/blob/master/docs/INSTALL.md">our install guide</a>)</em></p>\n\n<h2>Install Discourse Dependencies</h2>\n\n<p>Run <a href="https://github.com/techAPJ/install-rails/blob/master/linux">this script</a> in terminal, to setup Rails development environment:</p>\n\n<pre><code>bash &lt;(wget -qO- https://raw.githubusercontent.com/techAPJ/install-rails/master/linux)</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/9/9df737ab44032f2f671ac15513456bc668314591.png" class="lightbox" title="linux_script.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/9/9df737ab44032f2f671ac15513456bc668314591_1_690x189.png" width="690" height="189"><div class="meta">\n<span class="filename">linux_script.png</span><span class="informations">770x211 9.62 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>This will install following new packages on your system:</p>\n\n<ul>\n<li><a href="http://git-scm.com/">Git</a></li>\n<li><a href="https://github.com/sstephenson/rbenv">rbenv</a></li>\n<li><a href="https://github.com/sstephenson/ruby-build">ruby-build</a></li>\n<li>\n<a href="https://www.ruby-lang.org/">Ruby</a> (stable)</li>\n<li><a href="http://rubyonrails.org/">Rails</a></li>\n<li><a href="http://www.postgresql.org/">PostgreSQL</a></li>\n<li><a href="https://sqlite.org/">SQLite</a></li>\n<li><a href="http://redis.io/">Redis</a></li>\n<li><a href="http://bundler.io/">Bundler</a></li>\n<li><a href="http://www.imagemagick.org/">ImageMagick</a></li>\n</ul>\n\n<p>Install Phantomjs:</p>\n\n<p>For 32 bit machine:</p>\n\n<pre><code>cd /usr/local/share\nsudo wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-i686.tar.bz2\nsudo tar xvf phantomjs-1.9.8-linux-i686.tar.bz2\nsudo rm phantomjs-1.9.8-linux-i686.tar.bz2\nsudo ln -s /usr/local/share/phantomjs-1.9.8-linux-i686/bin/phantomjs /usr/local/bin/phantomjs\ncd</code></pre>\n\n<p>For 64 bit machine:</p>\n\n<pre><code>cd /usr/local/share\nsudo wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-x86_64.tar.bz2\nsudo tar xvf phantomjs-1.9.8-linux-x86_64.tar.bz2\nsudo rm phantomjs-1.9.8-linux-x86_64.tar.bz2\nsudo ln -s /usr/local/share/phantomjs-1.9.8-linux-x86_64/bin/phantomjs /usr/local/bin/phantomjs\ncd</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/0/0781669e092e0bdc29f8ec1830193503e884fd56.png" class="lightbox" title="phantomjs.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/0/0781669e092e0bdc29f8ec1830193503e884fd56_1_690x121.png" width="690" height="121"><div class="meta">\n<span class="filename">phantomjs.png</span><span class="informations">969x171 10.1 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p><em>In case you have any of this package pre-installed and don\'t want to run entire script, see the <a href="https://github.com/techAPJ/install-rails/blob/master/linux">script</a> and pick the packages you don\'t have currently installed. The script is fine-tuned for Discourse, and includes all the packages required for Discourse installation.</em></p>\n\n<p>Now that we have installed Discourse dependencies, let\'s move on to install Discourse itself.</p>\n\n<h2>Clone Discourse</h2>\n\n<p>Clone the Discourse repository in <code>~/discourse</code> folder:</p>\n\n<pre><code>git clone https://github.com/discourse/discourse.git ~/discourse</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/2/23578e144aa4c37d7e577d570d34789add1078f1.png" class="lightbox" title="git_clone.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/2/23578e144aa4c37d7e577d570d34789add1078f1_1_690x97.png" width="690" height="97"><div class="meta">\n<span class="filename">git_clone.png</span><span class="informations">967x137 7.73 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<h2>Setup Database</h2>\n\n<p>Open psql prompt as postgre user</p>\n\n<pre><code>sudo -u postgres psql postgres</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/1/1cb9e5198b2695904204c2b1434427b610468610.png" class="lightbox" title="pg.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/1/1cb9e5198b2695904204c2b1434427b610468610_1_690x177.png" width="690" height="177"><div class="meta">\n<span class="filename">pg.png</span><span class="informations">725x187 5.79 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Create role <strong>with the same name as your ubuntu system username</strong> with <em>discourse</em> as password:</p>\n\n<pre><code>CREATE ROLE discourse WITH LOGIN ENCRYPTED PASSWORD \'discourse\' CREATEDB SUPERUSER;</code></pre>\n\n<p>In the above command, I named the role as <strong>discourse</strong>, this means that my ubuntu system username is <strong>discourse</strong>. (<em>It is necessary for role name to be same as system username, otherwise migrations will not run</em>)</p>\n\n<p>Check that you have successfully created <strong>discourse</strong> role:</p>\n\n<pre><code>\\du</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/6/60439a04daa4efc8756a9528873cffb61c327bee.png" class="lightbox" title="pg_user.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/6/60439a04daa4efc8756a9528873cffb61c327bee_1_690x176.png" width="690" height="176"><div class="meta">\n<span class="filename">pg_user.png</span><span class="informations">725x185 7.5 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Create <strong>discourse_development</strong> and <strong>discourse_test</strong> database:</p>\n\n<pre><code>CREATE DATABASE discourse_development WITH OWNER discourse ENCODING \'UTF8\' TEMPLATE template0;\nCREATE DATABASE discourse_test WITH OWNER discourse ENCODING \'UTF8\' TEMPLATE template0;</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/1/183b46c7f1ffaa024e7c99884fbcc022da2c91b4.png" class="lightbox" title="pg_db.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/1/183b46c7f1ffaa024e7c99884fbcc022da2c91b4_1_690x136.png" width="690" height="136"><div class="meta">\n<span class="filename">pg_db.png</span><span class="informations">724x143 6.82 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Exit psql prompt by pressing <kbd>ctrl</kbd><kbd>d</kbd></p>\n\n<p>Now access psql prompt in <strong>discourse_development</strong> database as <strong>discourse</strong> user:</p>\n\n<pre><code>psql -d discourse_development -U discourse -h localhost</code></pre>\n\n<p>When prompted for password, provide the password which you set at the time of creating role, if you followed the guide as is, the password is <strong>discourse</strong></p>\n\n<p>Run following commands, separately:</p>\n\n<pre><code>CREATE EXTENSION pg_trgm;\nCREATE EXTENSION hstore;</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/0/04f4c1e4b3dd8ea1d183f653a77d35baca8c1201.png" class="lightbox" title="pg_dev.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/0/04f4c1e4b3dd8ea1d183f653a77d35baca8c1201_1_690x300.png" width="690" height="300"><div class="meta">\n<span class="filename">pg_dev.png</span><span class="informations">726x316 13.4 KB</span><span class="expand"></span>\n</div></a></div></p>\n\n<p>Exit psql prompt by pressing <kbd>ctrl</kbd><kbd>d</kbd></p>\n\n<p>Now access psql prompt in <strong>discourse_test</strong> database as <strong>discourse</strong> user:</p>\n\n<pre><code>psql -d discourse_test -U discourse -h localhost</code></pre>\n\n<p>When prompted for password, provide the password which you set at the time of creating role, if you followed the guide as is, the password is <strong>discourse</strong></p>\n\n<p>Run following commands, separately:</p>\n\n<pre><code>CREATE EXTENSION pg_trgm;\nCREATE EXTENSION hstore;</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/d/d2a25de9f227831bf66107ab2ddc1a7abafca2f4.png" class="lightbox" title="pg_test.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/d/d2a25de9f227831bf66107ab2ddc1a7abafca2f4_1_690x302.png" width="690" height="302"><div class="meta">\n<span class="filename">pg_test.png</span><span class="informations">726x318 12.9 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Exit psql prompt by pressing <kbd>ctrl</kbd><kbd>d</kbd></p>\n\n<p>You have set-up the database successfully!</p>\n\n<h2>Bootstrap Discourse</h2>\n\n<p>Switch to your Discourse folder:</p>\n\n<pre><code>cd ~/discourse</code></pre>\n\n<p>Install the needed gems</p>\n\n<pre><code>bundle install</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/e/e1e8390c232c20f6b532c80927cec07185a8e556.png" class="lightbox" title="bundle.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/e/e1e8390c232c20f6b532c80927cec07185a8e556_1_690x236.png" width="690" height="236"><div class="meta">\n<span class="filename">bundle.png</span><span class="informations">724x248 9.75 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Now that you have successfully configured database connection, run this command:</p>\n\n<pre><code>bundle exec rake db:migrate db:test:prepare db:seed_fu</code></pre>\n\n<p>Now, try running the specs: </p>\n\n<pre><code>bundle exec rake autospec</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/8/8a645e90108980cea7fa06a524ecbf1558e142f1.png" class="lightbox" title="specs.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/8/8a645e90108980cea7fa06a524ecbf1558e142f1_1_690x253.png" width="690" height="253"><div class="meta">\n<span class="filename">specs.png</span><span class="informations">717x263 8.63 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Start rails server:</p>\n\n<pre><code>bundle exec rails server</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/a/a8e7892e23bbfe3e613ebc6062605989de83310c.png" class="lightbox" title="server.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/a/a8e7892e23bbfe3e613ebc6062605989de83310c_1_690x218.png" width="690" height="218"><div class="meta">\n<span class="filename">server.png</span><span class="informations">724x229 10.8 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>You should now be able to connect to discourse app on <a href="http://localhost:3000">http://localhost:3000</a> - try it out!</p>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/3/3f2fbcd03c5a30b08c51155130418085da77744e.png" class="lightbox" title="discourse_start.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/3/3f2fbcd03c5a30b08c51155130418085da77744e_1_690x188.png" width="690" height="188"><div class="meta">\n<span class="filename">discourse_start.png</span><span class="informations">1919x525 20.3 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<h2>Configure Mail and Create New Account</h2>\n\n<p>We will use <a href="http://mailcatcher.me/">MailCatcher</a> to serve emails in development environment. Install and run MailCatcher:</p>\n\n<pre><code>gem install mailcatcher\nmailcatcher --http-ip 0.0.0.0</code></pre>\n\n<p>Create new account:</p>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/3X/1/d/1d2e710b0865e78868c74d6cc54f96d1e2eb9303.png" class="lightbox" title="create_account.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/3X/1/d/1d2e710b0865e78868c74d6cc54f96d1e2eb9303_1_690x384.png" width="690" height="384"><div class="meta">\n<span class="filename">create_account.png</span><span class="informations">720x401 13.5 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Check confirmation email by going to MailCatcher web interface at <a href="http://localhost:1080/">http://localhost:1080/</a></p>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/3X/2/9/292a2cb247b37770cf4506f8745fdc39753e547e.png" class="lightbox" title="mc_sign_up_email.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/3X/2/9/292a2cb247b37770cf4506f8745fdc39753e547e_1_690x172.png" width="690" height="172"><div class="meta">\n<span class="filename">mc_sign_up_email.png</span><span class="informations">1919x480 21.5 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p><em>If you did not receive the email, try running this in console</em>: <code>bundle exec sidekiq -q default</code></p>\n\n<p>Click the confirmation link and your account will be activated!</p>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/8/8fc06df9b084b4535bcafaaef675799d6ad3e5c9.png" class="lightbox" title="disc_normal_acc.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/8/8fc06df9b084b4535bcafaaef675799d6ad3e5c9_1_690x154.png" width="690" height="154"><div class="meta">\n<span class="filename">disc_normal_acc.png</span><span class="informations">1919x430 21.8 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<h2>Access Admin</h2>\n\n<p>Now, to make your account as admin, run the following commands in rails console:</p>\n\n<pre><code>RAILS_ENV=development bundle exec rails c\nu = User.last\nu.admin = true\nu.save</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/a/aa5478bc48ef8fef622e09e7948abb8ad8218000.png" class="lightbox" title="admin_console.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/a/aa5478bc48ef8fef622e09e7948abb8ad8218000_1_690x441.png" width="690" height="441"><div class="meta">\n<span class="filename">admin_console.png</span><span class="informations">722x462 31.7 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Once you execute the above commands successfully, check out your Discourse account again:</p>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/7/72840ed4dbbc02544471649ee4eaa272fde205ef.png" class="lightbox" title="admin_success.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/7/72840ed4dbbc02544471649ee4eaa272fde205ef_1_690x371.png" width="690" height="371"><div class="meta">\n<span class="filename">admin_success.png</span><span class="informations">1919x1032 30.3 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Congratulations! You are now the admin of your own Discourse installation!</p>\n\n<p>Happy hacking!</p>\n\n<p>If anything needs to be improved in this guide, feel free to ask on <a href="https://meta.discourse.org/t/developers-guide-to-install-discourse-on-ubuntu/14727">meta.discourse.org</a>, or even better, submit a <a href="https://github.com/techAPJ/discourse-development-ubuntu">pull request</a>.</p>',
+          '<p>So you want to set up Discourse on Ubuntu to hack on and develop with?</p>\n\n<p>We\'ll assume that you don\'t have Ruby/Rails/Postgre/Redis installed on your Ubuntu system. Let\'s begin!</p>\n\n<p><em>Although this guide assumes that you are using Ubuntu, but the set-up instructions will work fine for any Debian based distribution.</em></p>\n\n<p><em>(If you want to install Discourse for production use, see <a href="https://github.com/discourse/discourse/blob/main/docs/INSTALL.md">our install guide</a>)</em></p>\n\n<h2>Install Discourse Dependencies</h2>\n\n<p>Run <a href="https://github.com/techAPJ/install-rails/blob/master/linux">this script</a> in terminal, to setup Rails development environment:</p>\n\n<pre><code>bash &lt;(wget -qO- https://raw.githubusercontent.com/techAPJ/install-rails/master/linux)</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/9/9df737ab44032f2f671ac15513456bc668314591.png" class="lightbox" title="linux_script.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/9/9df737ab44032f2f671ac15513456bc668314591_1_690x189.png" width="690" height="189"><div class="meta">\n<span class="filename">linux_script.png</span><span class="informations">770x211 9.62 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>This will install following new packages on your system:</p>\n\n<ul>\n<li><a href="http://git-scm.com/">Git</a></li>\n<li><a href="https://github.com/sstephenson/rbenv">rbenv</a></li>\n<li><a href="https://github.com/sstephenson/ruby-build">ruby-build</a></li>\n<li>\n<a href="https://www.ruby-lang.org/">Ruby</a> (stable)</li>\n<li><a href="http://rubyonrails.org/">Rails</a></li>\n<li><a href="http://www.postgresql.org/">PostgreSQL</a></li>\n<li><a href="https://sqlite.org/">SQLite</a></li>\n<li><a href="http://redis.io/">Redis</a></li>\n<li><a href="http://bundler.io/">Bundler</a></li>\n<li><a href="http://www.imagemagick.org/">ImageMagick</a></li>\n</ul>\n\n<p>Install Phantomjs:</p>\n\n<p>For 32 bit machine:</p>\n\n<pre><code>cd /usr/local/share\nsudo wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-i686.tar.bz2\nsudo tar xvf phantomjs-1.9.8-linux-i686.tar.bz2\nsudo rm phantomjs-1.9.8-linux-i686.tar.bz2\nsudo ln -s /usr/local/share/phantomjs-1.9.8-linux-i686/bin/phantomjs /usr/local/bin/phantomjs\ncd</code></pre>\n\n<p>For 64 bit machine:</p>\n\n<pre><code>cd /usr/local/share\nsudo wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-x86_64.tar.bz2\nsudo tar xvf phantomjs-1.9.8-linux-x86_64.tar.bz2\nsudo rm phantomjs-1.9.8-linux-x86_64.tar.bz2\nsudo ln -s /usr/local/share/phantomjs-1.9.8-linux-x86_64/bin/phantomjs /usr/local/bin/phantomjs\ncd</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/0/0781669e092e0bdc29f8ec1830193503e884fd56.png" class="lightbox" title="phantomjs.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/0/0781669e092e0bdc29f8ec1830193503e884fd56_1_690x121.png" width="690" height="121"><div class="meta">\n<span class="filename">phantomjs.png</span><span class="informations">969x171 10.1 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p><em>In case you have any of this package pre-installed and don\'t want to run entire script, see the <a href="https://github.com/techAPJ/install-rails/blob/master/linux">script</a> and pick the packages you don\'t have currently installed. The script is fine-tuned for Discourse, and includes all the packages required for Discourse installation.</em></p>\n\n<p>Now that we have installed Discourse dependencies, let\'s move on to install Discourse itself.</p>\n\n<h2>Clone Discourse</h2>\n\n<p>Clone the Discourse repository in <code>~/discourse</code> folder:</p>\n\n<pre><code>git clone https://github.com/discourse/discourse.git ~/discourse</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/2/23578e144aa4c37d7e577d570d34789add1078f1.png" class="lightbox" title="git_clone.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/2/23578e144aa4c37d7e577d570d34789add1078f1_1_690x97.png" width="690" height="97"><div class="meta">\n<span class="filename">git_clone.png</span><span class="informations">967x137 7.73 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<h2>Setup Database</h2>\n\n<p>Open psql prompt as postgre user</p>\n\n<pre><code>sudo -u postgres psql postgres</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/1/1cb9e5198b2695904204c2b1434427b610468610.png" class="lightbox" title="pg.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/1/1cb9e5198b2695904204c2b1434427b610468610_1_690x177.png" width="690" height="177"><div class="meta">\n<span class="filename">pg.png</span><span class="informations">725x187 5.79 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Create role <strong>with the same name as your ubuntu system username</strong> with <em>discourse</em> as password:</p>\n\n<pre><code>CREATE ROLE discourse WITH LOGIN ENCRYPTED PASSWORD \'discourse\' CREATEDB SUPERUSER;</code></pre>\n\n<p>In the above command, I named the role as <strong>discourse</strong>, this means that my ubuntu system username is <strong>discourse</strong>. (<em>It is necessary for role name to be same as system username, otherwise migrations will not run</em>)</p>\n\n<p>Check that you have successfully created <strong>discourse</strong> role:</p>\n\n<pre><code>\\du</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/6/60439a04daa4efc8756a9528873cffb61c327bee.png" class="lightbox" title="pg_user.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/6/60439a04daa4efc8756a9528873cffb61c327bee_1_690x176.png" width="690" height="176"><div class="meta">\n<span class="filename">pg_user.png</span><span class="informations">725x185 7.5 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Create <strong>discourse_development</strong> and <strong>discourse_test</strong> database:</p>\n\n<pre><code>CREATE DATABASE discourse_development WITH OWNER discourse ENCODING \'UTF8\' TEMPLATE template0;\nCREATE DATABASE discourse_test WITH OWNER discourse ENCODING \'UTF8\' TEMPLATE template0;</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/1/183b46c7f1ffaa024e7c99884fbcc022da2c91b4.png" class="lightbox" title="pg_db.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/1/183b46c7f1ffaa024e7c99884fbcc022da2c91b4_1_690x136.png" width="690" height="136"><div class="meta">\n<span class="filename">pg_db.png</span><span class="informations">724x143 6.82 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Exit psql prompt by pressing <kbd>ctrl</kbd><kbd>d</kbd></p>\n\n<p>Now access psql prompt in <strong>discourse_development</strong> database as <strong>discourse</strong> user:</p>\n\n<pre><code>psql -d discourse_development -U discourse -h localhost</code></pre>\n\n<p>When prompted for password, provide the password which you set at the time of creating role, if you followed the guide as is, the password is <strong>discourse</strong></p>\n\n<p>Run following commands, separately:</p>\n\n<pre><code>CREATE EXTENSION pg_trgm;\nCREATE EXTENSION hstore;</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/0/04f4c1e4b3dd8ea1d183f653a77d35baca8c1201.png" class="lightbox" title="pg_dev.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/0/04f4c1e4b3dd8ea1d183f653a77d35baca8c1201_1_690x300.png" width="690" height="300"><div class="meta">\n<span class="filename">pg_dev.png</span><span class="informations">726x316 13.4 KB</span><span class="expand"></span>\n</div></a></div></p>\n\n<p>Exit psql prompt by pressing <kbd>ctrl</kbd><kbd>d</kbd></p>\n\n<p>Now access psql prompt in <strong>discourse_test</strong> database as <strong>discourse</strong> user:</p>\n\n<pre><code>psql -d discourse_test -U discourse -h localhost</code></pre>\n\n<p>When prompted for password, provide the password which you set at the time of creating role, if you followed the guide as is, the password is <strong>discourse</strong></p>\n\n<p>Run following commands, separately:</p>\n\n<pre><code>CREATE EXTENSION pg_trgm;\nCREATE EXTENSION hstore;</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/d/d2a25de9f227831bf66107ab2ddc1a7abafca2f4.png" class="lightbox" title="pg_test.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/d/d2a25de9f227831bf66107ab2ddc1a7abafca2f4_1_690x302.png" width="690" height="302"><div class="meta">\n<span class="filename">pg_test.png</span><span class="informations">726x318 12.9 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Exit psql prompt by pressing <kbd>ctrl</kbd><kbd>d</kbd></p>\n\n<p>You have set-up the database successfully!</p>\n\n<h2>Bootstrap Discourse</h2>\n\n<p>Switch to your Discourse folder:</p>\n\n<pre><code>cd ~/discourse</code></pre>\n\n<p>Install the needed gems</p>\n\n<pre><code>bundle install</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/e/e1e8390c232c20f6b532c80927cec07185a8e556.png" class="lightbox" title="bundle.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/e/e1e8390c232c20f6b532c80927cec07185a8e556_1_690x236.png" width="690" height="236"><div class="meta">\n<span class="filename">bundle.png</span><span class="informations">724x248 9.75 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Now that you have successfully configured database connection, run this command:</p>\n\n<pre><code>bundle exec rake db:migrate db:test:prepare db:seed_fu</code></pre>\n\n<p>Now, try running the specs: </p>\n\n<pre><code>bundle exec rake autospec</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/8/8a645e90108980cea7fa06a524ecbf1558e142f1.png" class="lightbox" title="specs.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/8/8a645e90108980cea7fa06a524ecbf1558e142f1_1_690x253.png" width="690" height="253"><div class="meta">\n<span class="filename">specs.png</span><span class="informations">717x263 8.63 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Start rails server:</p>\n\n<pre><code>bundle exec rails server</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/a/a8e7892e23bbfe3e613ebc6062605989de83310c.png" class="lightbox" title="server.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/a/a8e7892e23bbfe3e613ebc6062605989de83310c_1_690x218.png" width="690" height="218"><div class="meta">\n<span class="filename">server.png</span><span class="informations">724x229 10.8 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>You should now be able to connect to discourse app on <a href="http://localhost:3000">http://localhost:3000</a> - try it out!</p>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/3/3f2fbcd03c5a30b08c51155130418085da77744e.png" class="lightbox" title="discourse_start.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/3/3f2fbcd03c5a30b08c51155130418085da77744e_1_690x188.png" width="690" height="188"><div class="meta">\n<span class="filename">discourse_start.png</span><span class="informations">1919x525 20.3 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<h2>Configure Mail and Create New Account</h2>\n\n<p>We will use <a href="http://mailcatcher.me/">MailCatcher</a> to serve emails in development environment. Install and run MailCatcher:</p>\n\n<pre><code>gem install mailcatcher\nmailcatcher --http-ip 0.0.0.0</code></pre>\n\n<p>Create new account:</p>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/3X/1/d/1d2e710b0865e78868c74d6cc54f96d1e2eb9303.png" class="lightbox" title="create_account.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/3X/1/d/1d2e710b0865e78868c74d6cc54f96d1e2eb9303_1_690x384.png" width="690" height="384"><div class="meta">\n<span class="filename">create_account.png</span><span class="informations">720x401 13.5 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Check confirmation email by going to MailCatcher web interface at <a href="http://localhost:1080/">http://localhost:1080/</a></p>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/3X/2/9/292a2cb247b37770cf4506f8745fdc39753e547e.png" class="lightbox" title="mc_sign_up_email.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/3X/2/9/292a2cb247b37770cf4506f8745fdc39753e547e_1_690x172.png" width="690" height="172"><div class="meta">\n<span class="filename">mc_sign_up_email.png</span><span class="informations">1919x480 21.5 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p><em>If you did not receive the email, try running this in console</em>: <code>bundle exec sidekiq -q default</code></p>\n\n<p>Click the confirmation link and your account will be activated!</p>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/8/8fc06df9b084b4535bcafaaef675799d6ad3e5c9.png" class="lightbox" title="disc_normal_acc.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/8/8fc06df9b084b4535bcafaaef675799d6ad3e5c9_1_690x154.png" width="690" height="154"><div class="meta">\n<span class="filename">disc_normal_acc.png</span><span class="informations">1919x430 21.8 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<h2>Access Admin</h2>\n\n<p>Now, to make your account as admin, run the following commands in rails console:</p>\n\n<pre><code>RAILS_ENV=development bundle exec rails c\nu = User.last\nu.admin = true\nu.save</code></pre>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/a/aa5478bc48ef8fef622e09e7948abb8ad8218000.png" class="lightbox" title="admin_console.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/a/aa5478bc48ef8fef622e09e7948abb8ad8218000_1_690x441.png" width="690" height="441"><div class="meta">\n<span class="filename">admin_console.png</span><span class="informations">722x462 31.7 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Once you execute the above commands successfully, check out your Discourse account again:</p>\n\n<p><div class="lightbox-wrapper"><a href="//meta-s3-cdn.global.ssl.fastly.net/original/2X/7/72840ed4dbbc02544471649ee4eaa272fde205ef.png" class="lightbox" title="admin_success.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/7/72840ed4dbbc02544471649ee4eaa272fde205ef_1_690x371.png" width="690" height="371"><div class="meta">\n<span class="filename">admin_success.png</span><span class="informations">1919x1032 30.3 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Congratulations! You are now the admin of your own Discourse installation!</p>\n\n<p>Happy hacking!</p>\n\n<p>If anything needs to be improved in this guide, feel free to ask on <a href="https://meta.discourse.org/t/developers-guide-to-install-discourse-on-ubuntu/14727">meta.discourse.org</a>, or even better, submit a <a href="https://github.com/techAPJ/discourse-development-ubuntu">pull request</a>.</p>',
         post_number: 1,
         post_type: 1,
         updated_at: "2015-06-22T17:24:20.607Z",
@@ -249,7 +249,7 @@ export default {
         uploaded_avatar_id: 3281,
         created_at: "2014-05-19T16:59:51.082Z",
         cooked:
-          '<p>So you want to set up Discourse on Mac OS X to hack on and develop with?</p>\n\n<p>We\'ll assume that you don\'t have Ruby/Rails/Postgre/Redis installed on your Mac. Let\'s begin!</p>\n\n<p><em>(If you want to install Discourse for production use, see <a href="https://github.com/discourse/discourse/blob/master/docs/INSTALL.md">our install guide</a>)</em></p>\n\n<h2>Install Discourse Dependencies</h2>\n\n<p>Run <a href="https://github.com/techAPJ/install-rails/blob/master/mac">this script</a> in terminal, to setup Rails development environment:</p>\n\n<pre><code>bash &lt;(curl -s https://raw.githubusercontent.com/techAPJ/install-rails/master/mac)</code></pre>\n\n<p>This script will install following new packages on your system:</p>\n\n<ul>\n<li><a href="http://git-scm.com/">Git</a></li>\n<li><a href="https://github.com/sstephenson/rbenv">rbenv</a></li>\n<li><a href="https://github.com/sstephenson/ruby-build">ruby-build</a></li>\n<li>\n<a href="https://www.ruby-lang.org/">Ruby</a> (latest stable)</li>\n<li><a href="http://rubyonrails.org/">Rails</a></li>\n<li><a href="http://www.postgresql.org/">PostgreSQL</a></li>\n<li><a href="http://redis.io/">Redis</a></li>\n<li><a href="http://bundler.io/">Bundler</a></li>\n<li><a href="http://www.imagemagick.org/">ImageMagick</a></li>\n<li><a href="http://phantomjs.org/">PhantomJS</a></li>\n</ul>\n\n<p><em>In case you have any of this package pre-installed and don\'t want to run entire script, see the <a href="https://github.com/techAPJ/install-rails/blob/master/mac">script</a> and pick the packages you don\'t have currently installed. The script is fine-tuned for Discourse, and includes all the packages required for Discourse installation.</em></p>\n\n<p>Now that we have installed Discourse dependencies, let\'s move on to install Discourse itself.</p>\n\n<h2>Clone Discourse</h2>\n\n<p>Clone the Discourse repository in <code>~/discourse</code> folder:</p>\n\n<pre><code>git clone https://github.com/discourse/discourse.git ~/discourse</code></pre>\n\n<p><img src="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/e/ed047a1077c7d3af966434d093fbf9ddd3db51d9.png" width="571" height="142"> </p>\n\n<p><code>~</code> indicates home folder, so Discourse source code will be available in your home folder.</p>\n\n<h2>Setup Database</h2>\n\n<p>Open psql prompt:</p>\n\n<pre><code>psql postgres</code></pre>\n\n<p><img src="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/0/0a31b7a439991beedf32a974abd423cd7a774b76.png" width="574" height="148"> </p>\n\n<p>Create <strong>discourse_development</strong> and <strong>discourse_test</strong> database with your <em><a href="http://forums.macrumors.com/showthread.php?t=898855">account short name</a></em> specified as role:</p>\n\n<pre><code>CREATE DATABASE discourse_development WITH OWNER techapj ENCODING \'UTF8\' TEMPLATE template0;\nCREATE DATABASE discourse_test WITH OWNER techapj ENCODING \'UTF8\' TEMPLATE template0;</code></pre>\n\n<p>Note that in above commands I specified the role as <em>techapj</em>, this means that my <a href="http://forums.macrumors.com/showthread.php?t=898855">short name</a> is <em>techapj</em>, <strong>replace this with your own <a href="http://forums.macrumors.com/showthread.php?t=898855">short name</a>.</strong></p>\n\n<p><img src="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/9/9e976ace87a952fe60879c522234082fd7166eaf.png" width="573" height="235"> </p>\n\n<p>Exit psql prompt by pressing <kbd>control</kbd><kbd>d</kbd></p>\n\n<p>Now access psql prompt in <strong>discourse_development</strong> database as <em>your short name</em> user:</p>\n\n<pre><code>psql -d discourse_development -U techapj -h localhost</code></pre>\n\n<p>Run following commands, separately:</p>\n\n<pre><code>CREATE EXTENSION pg_trgm;\nCREATE EXTENSION hstore;</code></pre>\n\n<p><img src="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/9/9bfda41f4f5b020735cd641a4922e0696ad148a0.png" width="571" height="208"> </p>\n\n<p>Exit psql prompt by pressing <kbd>control</kbd><kbd>d</kbd></p>\n\n<p>Now access psql prompt in <strong>discourse_test</strong> database as <em>your short name</em> user:</p>\n\n<pre><code>psql -d discourse_test -U techapj -h localhost</code></pre>\n\n<p>Run following commands, separately:</p>\n\n<pre><code>CREATE EXTENSION pg_trgm;\nCREATE EXTENSION hstore;</code></pre>\n\n<p><img src="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/3/319b2a9f4b63cf8daf1ce3a4060f2465b6717a7f.png" width="571" height="205"> </p>\n\n<p>Exit psql prompt by pressing <kbd>control</kbd><kbd>d</kbd></p>\n\n<p>You have set-up the database successfully!</p>\n\n<h2>Bootstrap Discourse</h2>\n\n<p>Switch to your Discourse folder:</p>\n\n<pre><code>cd ~/discourse</code></pre>\n\n<p>Install the needed gems</p>\n\n<pre><code>bundle install</code></pre>\n\n<p><img src="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/e/eaabecd382ed7241e7f30c9bd20239140b5fd384.png" width="572" height="366"> </p>\n\n<p>Now that you have successfully installed gems, run this command:</p>\n\n<pre><code>bundle exec rake db:migrate db:test:prepare db:seed_fu</code></pre>\n\n<p>Try running the specs: </p>\n\n<pre><code>bundle exec rake autospec</code></pre>\n\n<p><img src="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/4/4b1414710dd77e46e0add0e78168d392f5a81e2c.png" width="574" height="429"> </p>\n\n<p>All the tests should pass.</p>\n\n<p>Start rails server:</p>\n\n<pre><code>bundle exec rails server</code></pre>\n\n<p><img src="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/0/00584d579d543960d53a36512a2ba4f649204ad4.png" width="575" height="279"> </p>\n\n<p>You should now be able to connect with your Discourse app on <a href="http://localhost:3000">http://localhost:3000</a> - try it out!</p>\n\n<p><div class="lightbox-wrapper"><a href="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/6/6325a4d6da2ec891eb8a58dede2b501447050287.png" class="lightbox" title="Screen Shot 2014-05-19 at 13.04.01.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/6/6325a4d6da2ec891eb8a58dede2b501447050287_1_690x253.png" width="690" height="253"><div class="meta">\n<span class="filename">Screen Shot 2014-05-19 at 13.04.01.png</span><span class="informations">1255x461 98.7 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<h2>Create New Admin</h2>\n\n<p>To create a new admin, run the following commands in rails console:</p>\n\n<pre><code>RAILS_ENV=development bundle exec rake admin:create</code></pre>\n\n<p>Just enter your input as suggested, you can create an admin account. </p>\n\n<p><div class="lightbox-wrapper"><a href="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/8/8fc06df9b084b4535bcafaaef675799d6ad3e5c9.png" class="lightbox" title="fccdb29463e82f23.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/8/8fc06df9b084b4535bcafaaef675799d6ad3e5c9.png" width="690" height="154"><div class="meta">\n<span class="filename">fccdb29463e82f23.png</span><span class="informations">1919x430</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p><div class="lightbox-wrapper"><a href="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/9/982a9ffe0223aebb8df7fd9efbd07dbedef78c0a.png" class="lightbox" title="Screen Shot 2014-05-19 at 13.20.02.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/9/982a9ffe0223aebb8df7fd9efbd07dbedef78c0a_1_690x415.png" width="690" height="415"><div class="meta">\n<span class="filename">Screen Shot 2014-05-19 at 13.20.02.png</span><span class="informations">1256x756 124 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Happy hacking!</p>',
+          '<p>So you want to set up Discourse on Mac OS X to hack on and develop with?</p>\n\n<p>We\'ll assume that you don\'t have Ruby/Rails/Postgre/Redis installed on your Mac. Let\'s begin!</p>\n\n<p><em>(If you want to install Discourse for production use, see <a href="https://github.com/discourse/discourse/blob/main/docs/INSTALL.md">our install guide</a>)</em></p>\n\n<h2>Install Discourse Dependencies</h2>\n\n<p>Run <a href="https://github.com/techAPJ/install-rails/blob/master/mac">this script</a> in terminal, to setup Rails development environment:</p>\n\n<pre><code>bash &lt;(curl -s https://raw.githubusercontent.com/techAPJ/install-rails/master/mac)</code></pre>\n\n<p>This script will install following new packages on your system:</p>\n\n<ul>\n<li><a href="http://git-scm.com/">Git</a></li>\n<li><a href="https://github.com/sstephenson/rbenv">rbenv</a></li>\n<li><a href="https://github.com/sstephenson/ruby-build">ruby-build</a></li>\n<li>\n<a href="https://www.ruby-lang.org/">Ruby</a> (latest stable)</li>\n<li><a href="http://rubyonrails.org/">Rails</a></li>\n<li><a href="http://www.postgresql.org/">PostgreSQL</a></li>\n<li><a href="http://redis.io/">Redis</a></li>\n<li><a href="http://bundler.io/">Bundler</a></li>\n<li><a href="http://www.imagemagick.org/">ImageMagick</a></li>\n<li><a href="http://phantomjs.org/">PhantomJS</a></li>\n</ul>\n\n<p><em>In case you have any of this package pre-installed and don\'t want to run entire script, see the <a href="https://github.com/techAPJ/install-rails/blob/master/mac">script</a> and pick the packages you don\'t have currently installed. The script is fine-tuned for Discourse, and includes all the packages required for Discourse installation.</em></p>\n\n<p>Now that we have installed Discourse dependencies, let\'s move on to install Discourse itself.</p>\n\n<h2>Clone Discourse</h2>\n\n<p>Clone the Discourse repository in <code>~/discourse</code> folder:</p>\n\n<pre><code>git clone https://github.com/discourse/discourse.git ~/discourse</code></pre>\n\n<p><img src="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/e/ed047a1077c7d3af966434d093fbf9ddd3db51d9.png" width="571" height="142"> </p>\n\n<p><code>~</code> indicates home folder, so Discourse source code will be available in your home folder.</p>\n\n<h2>Setup Database</h2>\n\n<p>Open psql prompt:</p>\n\n<pre><code>psql postgres</code></pre>\n\n<p><img src="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/0/0a31b7a439991beedf32a974abd423cd7a774b76.png" width="574" height="148"> </p>\n\n<p>Create <strong>discourse_development</strong> and <strong>discourse_test</strong> database with your <em><a href="http://forums.macrumors.com/showthread.php?t=898855">account short name</a></em> specified as role:</p>\n\n<pre><code>CREATE DATABASE discourse_development WITH OWNER techapj ENCODING \'UTF8\' TEMPLATE template0;\nCREATE DATABASE discourse_test WITH OWNER techapj ENCODING \'UTF8\' TEMPLATE template0;</code></pre>\n\n<p>Note that in above commands I specified the role as <em>techapj</em>, this means that my <a href="http://forums.macrumors.com/showthread.php?t=898855">short name</a> is <em>techapj</em>, <strong>replace this with your own <a href="http://forums.macrumors.com/showthread.php?t=898855">short name</a>.</strong></p>\n\n<p><img src="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/9/9e976ace87a952fe60879c522234082fd7166eaf.png" width="573" height="235"> </p>\n\n<p>Exit psql prompt by pressing <kbd>control</kbd><kbd>d</kbd></p>\n\n<p>Now access psql prompt in <strong>discourse_development</strong> database as <em>your short name</em> user:</p>\n\n<pre><code>psql -d discourse_development -U techapj -h localhost</code></pre>\n\n<p>Run following commands, separately:</p>\n\n<pre><code>CREATE EXTENSION pg_trgm;\nCREATE EXTENSION hstore;</code></pre>\n\n<p><img src="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/9/9bfda41f4f5b020735cd641a4922e0696ad148a0.png" width="571" height="208"> </p>\n\n<p>Exit psql prompt by pressing <kbd>control</kbd><kbd>d</kbd></p>\n\n<p>Now access psql prompt in <strong>discourse_test</strong> database as <em>your short name</em> user:</p>\n\n<pre><code>psql -d discourse_test -U techapj -h localhost</code></pre>\n\n<p>Run following commands, separately:</p>\n\n<pre><code>CREATE EXTENSION pg_trgm;\nCREATE EXTENSION hstore;</code></pre>\n\n<p><img src="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/3/319b2a9f4b63cf8daf1ce3a4060f2465b6717a7f.png" width="571" height="205"> </p>\n\n<p>Exit psql prompt by pressing <kbd>control</kbd><kbd>d</kbd></p>\n\n<p>You have set-up the database successfully!</p>\n\n<h2>Bootstrap Discourse</h2>\n\n<p>Switch to your Discourse folder:</p>\n\n<pre><code>cd ~/discourse</code></pre>\n\n<p>Install the needed gems</p>\n\n<pre><code>bundle install</code></pre>\n\n<p><img src="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/e/eaabecd382ed7241e7f30c9bd20239140b5fd384.png" width="572" height="366"> </p>\n\n<p>Now that you have successfully installed gems, run this command:</p>\n\n<pre><code>bundle exec rake db:migrate db:test:prepare db:seed_fu</code></pre>\n\n<p>Try running the specs: </p>\n\n<pre><code>bundle exec rake autospec</code></pre>\n\n<p><img src="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/4/4b1414710dd77e46e0add0e78168d392f5a81e2c.png" width="574" height="429"> </p>\n\n<p>All the tests should pass.</p>\n\n<p>Start rails server:</p>\n\n<pre><code>bundle exec rails server</code></pre>\n\n<p><img src="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/0/00584d579d543960d53a36512a2ba4f649204ad4.png" width="575" height="279"> </p>\n\n<p>You should now be able to connect with your Discourse app on <a href="http://localhost:3000">http://localhost:3000</a> - try it out!</p>\n\n<p><div class="lightbox-wrapper"><a href="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/6/6325a4d6da2ec891eb8a58dede2b501447050287.png" class="lightbox" title="Screen Shot 2014-05-19 at 13.04.01.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/6/6325a4d6da2ec891eb8a58dede2b501447050287_1_690x253.png" width="690" height="253"><div class="meta">\n<span class="filename">Screen Shot 2014-05-19 at 13.04.01.png</span><span class="informations">1255x461 98.7 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<h2>Create New Admin</h2>\n\n<p>To create a new admin, run the following commands in rails console:</p>\n\n<pre><code>RAILS_ENV=development bundle exec rake admin:create</code></pre>\n\n<p>Just enter your input as suggested, you can create an admin account. </p>\n\n<p><div class="lightbox-wrapper"><a href="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/8/8fc06df9b084b4535bcafaaef675799d6ad3e5c9.png" class="lightbox" title="fccdb29463e82f23.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/8/8fc06df9b084b4535bcafaaef675799d6ad3e5c9.png" width="690" height="154"><div class="meta">\n<span class="filename">fccdb29463e82f23.png</span><span class="informations">1919x430</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p><div class="lightbox-wrapper"><a href="//discourse-meta.s3-us-west-1.amazonaws.com/original/2X/9/982a9ffe0223aebb8df7fd9efbd07dbedef78c0a.png" class="lightbox" title="Screen Shot 2014-05-19 at 13.20.02.png"><img src="//discourse-meta.s3-us-west-1.amazonaws.com/optimized/2X/9/982a9ffe0223aebb8df7fd9efbd07dbedef78c0a_1_690x415.png" width="690" height="415"><div class="meta">\n<span class="filename">Screen Shot 2014-05-19 at 13.20.02.png</span><span class="informations">1256x756 124 KB</span><span class="expand"></span>\n</div></a></div> </p>\n\n<p>Happy hacking!</p>',
         post_number: 1,
         post_type: 1,
         updated_at: "2015-04-26T06:51:23.549Z",
@@ -339,7 +339,7 @@ export default {
         uploaded_avatar_id: null,
         created_at: "2014-01-24T15:08:06.111Z",
         cooked:
-          '<p>Continuing the discussion from <a href="https://meta.discourse.org/t/log-of-setting-up-docker-in-virtualbox/12111/7">Log of setting up Docker in Virtualbox</a>:</p>\n\n<aside class="quote" data-post="7" data-topic="12111" data-full="true"><div class="title">\n<div class="quote-controls"></div>\n<img alt="" width="20" height="20" src="//discourse-cdn.global.ssl.fastly.net/meta/user_avatar/meta.discourse.org/riking/40/40212_1.png" class="avatar">riking:</div>\n<blockquote><p>I\'m actually loving having the VM set up - whenever I need to test something, the server was savestated with it running, so all I need to do is go to <code>/admin/docker</code>, refresh once, hit upgrade, and test it out.</p></blockquote></aside>\n\n<p>What is the preferred development environment these days? I have Vagrant up and running as recommended in <a href="http://blog.discourse.org/2013/04/discourse-as-your-first-rails-app/" rel="nofollow">Discourse as Your First Rails App</a> and <a href="https://github.com/discourse/discourse/blob/master/docs/VAGRANT.md" rel="nofollow">Discourse Vagrant Developer Guide</a>, but much of the recent discussion has been about <a href="https://github.com/discourse/discourse_docker" rel="nofollow">Discourse Docker</a> (which I freely admit I haven\'t really looked at for lack of time).</p>\n\n<p>For development purposes, should I carry on using Vagrant for the time being? Or should I be setting up a VM with Ubuntu and then installing Docker and Discourse Docker?</p>\n\n<p>(As a related side issue, my current production environment was built by following the <a href="https://github.com/discourse/discourse/blob/master/docs/INSTALL-ubuntu.md" rel="nofollow">Discourse Install Guide</a>. Would it be prudent to switch that over to Docker at some point as well? Meaning, is version 1.0 likely to recommend Docker instead of a raw installation? This question deserves a topic of its own in some other category, but it seems best to see what people have to say about development environments before launching a second, better-informed discussion about production environments.)</p>\n\n<p>So, for development, Vagrant or Docker?</p>',
+          '<p>Continuing the discussion from <a href="https://meta.discourse.org/t/log-of-setting-up-docker-in-virtualbox/12111/7">Log of setting up Docker in Virtualbox</a>:</p>\n\n<aside class="quote" data-post="7" data-topic="12111" data-full="true"><div class="title">\n<div class="quote-controls"></div>\n<img alt="" width="20" height="20" src="//discourse-cdn.global.ssl.fastly.net/meta/user_avatar/meta.discourse.org/riking/40/40212_1.png" class="avatar">riking:</div>\n<blockquote><p>I\'m actually loving having the VM set up - whenever I need to test something, the server was savestated with it running, so all I need to do is go to <code>/admin/docker</code>, refresh once, hit upgrade, and test it out.</p></blockquote></aside>\n\n<p>What is the preferred development environment these days? I have Vagrant up and running as recommended in <a href="http://blog.discourse.org/2013/04/discourse-as-your-first-rails-app/" rel="nofollow">Discourse as Your First Rails App</a> and <a href="https://github.com/discourse/discourse/blob/main/docs/VAGRANT.md" rel="nofollow">Discourse Vagrant Developer Guide</a>, but much of the recent discussion has been about <a href="https://github.com/discourse/discourse_docker" rel="nofollow">Discourse Docker</a> (which I freely admit I haven\'t really looked at for lack of time).</p>\n\n<p>For development purposes, should I carry on using Vagrant for the time being? Or should I be setting up a VM with Ubuntu and then installing Docker and Discourse Docker?</p>\n\n<p>(As a related side issue, my current production environment was built by following the <a href="https://github.com/discourse/discourse/blob/main/docs/INSTALL-ubuntu.md" rel="nofollow">Discourse Install Guide</a>. Would it be prudent to switch that over to Docker at some point as well? Meaning, is version 1.0 likely to recommend Docker instead of a raw installation? This question deserves a topic of its own in some other category, but it seems best to see what people have to say about development environments before launching a second, better-informed discussion about production environments.)</p>\n\n<p>So, for development, Vagrant or Docker?</p>',
         post_number: 1,
         post_type: 1,
         updated_at: "2014-01-24T15:08:06.111Z",
diff --git a/spec/fixtures/onebox/githubfolder-discourse-root.response b/spec/fixtures/onebox/githubfolder-discourse-root.response
index 23075c565b..d88ba433af 100644
--- a/spec/fixtures/onebox/githubfolder-discourse-root.response
+++ b/spec/fixtures/onebox/githubfolder-discourse-root.response
@@ -111,7 +111,7 @@
   <meta http-equiv="x-pjax-version" content="f529776b45bbce11285b3d001899ace95e8dca2a27515664138433b99fe7bd6b">
 
 
-        <link href="https://github.com/discourse/discourse/commits/master.atom" rel="alternate" title="Recent Commits to discourse:master" type="application/atom+xml">
+        <link href="https://github.com/discourse/discourse/commits/main.atom" rel="alternate" title="Recent Commits to discourse:master" type="application/atom+xml">
 
   <meta name="go-import" content="github.com/discourse/discourse git https://github.com/discourse/discourse.git">
 
@@ -578,7 +578,7 @@
         </span>
       </div>
       <div class="mb-2">
-        <a href="/discourse/discourse/blob/master/LICENSE.txt" class="muted-link">
+        <a href="/discourse/discourse/blob/main/LICENSE.txt" class="muted-link">
           <svg class="octicon octicon-law mr-1" height="16" viewBox="0 0 16 16" version="1.1" width="16" aria-hidden="true"><path fill-rule="evenodd" d="M8.75.75a.75.75 0 00-1.5 0V2h-.984c-.305 0-.604.08-.869.23l-1.288.737A.25.25 0 013.984 3H1.75a.75.75 0 000 1.5h.428L.066 9.192a.75.75 0 00.154.838l.53-.53-.53.53v.001l.002.002.002.002.006.006.016.015.045.04a3.514 3.514 0 00.686.45A4.492 4.492 0 003 11c.88 0 1.556-.22 2.023-.454a3.515 3.515 0 00.686-.45l.045-.04.016-.015.006-.006.002-.002.001-.002L5.25 9.5l.53.53a.75.75 0 00.154-.838L3.822 4.5h.162c.305 0 .604-.08.869-.23l1.289-.737a.25.25 0 01.124-.033h.984V13h-2.5a.75.75 0 000 1.5h6.5a.75.75 0 000-1.5h-2.5V3.5h.984a.25.25 0 01.124.033l1.29.736c.264.152.563.231.868.231h.162l-2.112 4.692a.75.75 0 00.154.838l.53-.53-.53.53v.001l.002.002.002.002.006.006.016.015.045.04a3.517 3.517 0 00.686.45A4.492 4.492 0 0013 11c.88 0 1.556-.22 2.023-.454a3.512 3.512 0 00.686-.45l.045-.04.01-.01.006-.005.006-.006.002-.002.001-.002-.529-.531.53.53a.75.75 0 00.154-.838L13.823 4.5h.427a.75.75 0 000-1.5h-2.234a.25.25 0 01-.124-.033l-1.29-.736A1.75 1.75 0 009.735 2H8.75V.75zM1.695 9.227c.285.135.718.273 1.305.273s1.02-.138 1.305-.273L3 6.327l-1.305 2.9zm10 0c.285.135.718.273 1.305.273s1.02-.138 1.305-.273L13 6.327l-1.305 2.9z"></path></svg>
             View license
         </a>
@@ -940,7 +940,7 @@
         <h2 class="sr-only">Git stats</h2>
         <ul class="list-style-none d-flex">
           <li class="ml-0 ml-md-3">
-            <a data-pjax href="/discourse/discourse/commits/master" class="pl-3 pr-3 py-3 p-md-0 mt-n3 mb-n3 mr-n3 m-md-0 link-gray-dark no-underline no-wrap">
+            <a data-pjax href="/discourse/discourse/commits/main" class="pl-3 pr-3 py-3 p-md-0 mt-n3 mb-n3 mr-n3 m-md-0 link-gray-dark no-underline no-wrap">
               <svg class="octicon octicon-history text-gray" height="16" viewBox="0 0 16 16" version="1.1" width="16" aria-hidden="true"><path fill-rule="evenodd" d="M1.643 3.143L.427 1.927A.25.25 0 000 2.104V5.75c0 .138.112.25.25.25h3.646a.25.25 0 00.177-.427L2.715 4.215a6.5 6.5 0 11-1.18 4.458.75.75 0 10-1.493.154 8.001 8.001 0 101.6-5.684zM7.75 4a.75.75 0 01.75.75v2.992l2.028.812a.75.75 0 01-.557 1.392l-2.5-1A.75.75 0 017 8.25v-3.5A.75.75 0 017.75 4z"></path></svg>
               <span class="d-none d-sm-inline">
                     <strong>40,024</strong>
@@ -980,7 +980,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".github" href="/discourse/discourse/tree/master/.github">.github</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".github" href="/discourse/discourse/tree/main/.github">.github</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -999,7 +999,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="app" href="/discourse/discourse/tree/master/app">app</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="app" href="/discourse/discourse/tree/main/app">app</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1018,7 +1018,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="bin" href="/discourse/discourse/tree/master/bin">bin</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="bin" href="/discourse/discourse/tree/main/bin">bin</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1037,7 +1037,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="config" href="/discourse/discourse/tree/master/config">config</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="config" href="/discourse/discourse/tree/main/config">config</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1056,7 +1056,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="db" href="/discourse/discourse/tree/master/db">db</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="db" href="/discourse/discourse/tree/main/db">db</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1075,7 +1075,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="docs" href="/discourse/discourse/tree/master/docs">docs</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="docs" href="/discourse/discourse/tree/main/docs">docs</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1094,7 +1094,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="images" href="/discourse/discourse/tree/master/images">images</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="images" href="/discourse/discourse/tree/main/images">images</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1113,7 +1113,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="lib" href="/discourse/discourse/tree/master/lib">lib</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="lib" href="/discourse/discourse/tree/main/lib">lib</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1132,7 +1132,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="log" href="/discourse/discourse/tree/master/log">log</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="log" href="/discourse/discourse/tree/main/log">log</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1151,7 +1151,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="plugins" href="/discourse/discourse/tree/master/plugins">plugins</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="plugins" href="/discourse/discourse/tree/main/plugins">plugins</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1170,7 +1170,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="public" href="/discourse/discourse/tree/master/public">public</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="public" href="/discourse/discourse/tree/main/public">public</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1189,7 +1189,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="script" href="/discourse/discourse/tree/master/script">script</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="script" href="/discourse/discourse/tree/main/script">script</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1208,7 +1208,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="spec" href="/discourse/discourse/tree/master/spec">spec</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="spec" href="/discourse/discourse/tree/main/spec">spec</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1227,7 +1227,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="test" href="/discourse/discourse/tree/master/test">test</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="test" href="/discourse/discourse/tree/main/test">test</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1246,7 +1246,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="vendor" href="/discourse/discourse/tree/master/vendor">vendor</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="vendor" href="/discourse/discourse/tree/main/vendor">vendor</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1265,7 +1265,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".editorconfig" href="/discourse/discourse/blob/master/.editorconfig">.editorconfig</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".editorconfig" href="/discourse/discourse/blob/main/.editorconfig">.editorconfig</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1284,7 +1284,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".eslintignore" href="/discourse/discourse/blob/master/.eslintignore">.eslintignore</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".eslintignore" href="/discourse/discourse/blob/main/.eslintignore">.eslintignore</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1303,7 +1303,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".eslintrc" href="/discourse/discourse/blob/master/.eslintrc">.eslintrc</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".eslintrc" href="/discourse/discourse/blob/main/.eslintrc">.eslintrc</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1322,7 +1322,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".git-blame-ignore-revs" href="/discourse/discourse/blob/master/.git-blame-ignore-revs">.git-blame-ignore-revs</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".git-blame-ignore-revs" href="/discourse/discourse/blob/main/.git-blame-ignore-revs">.git-blame-ignore-revs</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1341,7 +1341,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".gitattributes" href="/discourse/discourse/blob/master/.gitattributes">.gitattributes</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".gitattributes" href="/discourse/discourse/blob/main/.gitattributes">.gitattributes</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1360,7 +1360,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".gitignore" href="/discourse/discourse/blob/master/.gitignore">.gitignore</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".gitignore" href="/discourse/discourse/blob/main/.gitignore">.gitignore</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1379,7 +1379,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".licensed.yml" href="/discourse/discourse/blob/master/.licensed.yml">.licensed.yml</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".licensed.yml" href="/discourse/discourse/blob/main/.licensed.yml">.licensed.yml</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1398,7 +1398,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".prettierignore" href="/discourse/discourse/blob/master/.prettierignore">.prettierignore</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".prettierignore" href="/discourse/discourse/blob/main/.prettierignore">.prettierignore</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1417,7 +1417,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".prettierrc" href="/discourse/discourse/blob/master/.prettierrc">.prettierrc</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".prettierrc" href="/discourse/discourse/blob/main/.prettierrc">.prettierrc</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1436,7 +1436,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".rspec" href="/discourse/discourse/blob/master/.rspec">.rspec</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".rspec" href="/discourse/discourse/blob/main/.rspec">.rspec</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1455,7 +1455,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".rspec_parallel" href="/discourse/discourse/blob/master/.rspec_parallel">.rspec_parallel</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".rspec_parallel" href="/discourse/discourse/blob/main/.rspec_parallel">.rspec_parallel</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1474,7 +1474,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".rubocop.yml" href="/discourse/discourse/blob/master/.rubocop.yml">.rubocop.yml</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".rubocop.yml" href="/discourse/discourse/blob/main/.rubocop.yml">.rubocop.yml</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1493,7 +1493,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".ruby-gemset.sample" href="/discourse/discourse/blob/master/.ruby-gemset.sample">.ruby-gemset.sample</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".ruby-gemset.sample" href="/discourse/discourse/blob/main/.ruby-gemset.sample">.ruby-gemset.sample</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1512,7 +1512,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".ruby-version.sample" href="/discourse/discourse/blob/master/.ruby-version.sample">.ruby-version.sample</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".ruby-version.sample" href="/discourse/discourse/blob/main/.ruby-version.sample">.ruby-version.sample</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1531,7 +1531,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".template-lintrc.js" href="/discourse/discourse/blob/master/.template-lintrc.js">.template-lintrc.js</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title=".template-lintrc.js" href="/discourse/discourse/blob/main/.template-lintrc.js">.template-lintrc.js</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1550,7 +1550,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="Brewfile" href="/discourse/discourse/blob/master/Brewfile">Brewfile</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="Brewfile" href="/discourse/discourse/blob/main/Brewfile">Brewfile</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1569,7 +1569,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="CONTRIBUTING.md" href="/discourse/discourse/blob/master/CONTRIBUTING.md">CONTRIBUTING.md</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="CONTRIBUTING.md" href="/discourse/discourse/blob/main/CONTRIBUTING.md">CONTRIBUTING.md</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1588,7 +1588,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="COPYRIGHT.txt" itemprop="license" href="/discourse/discourse/blob/master/COPYRIGHT.txt">COPYRIGHT.txt</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="COPYRIGHT.txt" itemprop="license" href="/discourse/discourse/blob/main/COPYRIGHT.txt">COPYRIGHT.txt</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1607,7 +1607,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="Dangerfile" href="/discourse/discourse/blob/master/Dangerfile">Dangerfile</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="Dangerfile" href="/discourse/discourse/blob/main/Dangerfile">Dangerfile</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1626,7 +1626,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="Gemfile" href="/discourse/discourse/blob/master/Gemfile">Gemfile</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="Gemfile" href="/discourse/discourse/blob/main/Gemfile">Gemfile</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1645,7 +1645,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="Gemfile.lock" href="/discourse/discourse/blob/master/Gemfile.lock">Gemfile.lock</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="Gemfile.lock" href="/discourse/discourse/blob/main/Gemfile.lock">Gemfile.lock</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1664,7 +1664,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="LICENSE.txt" itemprop="license" href="/discourse/discourse/blob/master/LICENSE.txt">LICENSE.txt</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="LICENSE.txt" itemprop="license" href="/discourse/discourse/blob/main/LICENSE.txt">LICENSE.txt</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1683,7 +1683,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="README.md" href="/discourse/discourse/blob/master/README.md">README.md</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="README.md" href="/discourse/discourse/blob/main/README.md">README.md</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1702,7 +1702,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="Rakefile" href="/discourse/discourse/blob/master/Rakefile">Rakefile</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="Rakefile" href="/discourse/discourse/blob/main/Rakefile">Rakefile</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1721,7 +1721,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="adminjs" href="/discourse/discourse/blob/master/adminjs">adminjs</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="adminjs" href="/discourse/discourse/blob/main/adminjs">adminjs</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1740,7 +1740,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="config.ru" href="/discourse/discourse/blob/master/config.ru">config.ru</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="config.ru" href="/discourse/discourse/blob/main/config.ru">config.ru</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1759,7 +1759,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="d" href="/discourse/discourse/blob/master/d">d</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="d" href="/discourse/discourse/blob/main/d">d</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1778,7 +1778,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="discourse.sublime-project" href="/discourse/discourse/blob/master/discourse.sublime-project">discourse.sublime-project</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="discourse.sublime-project" href="/discourse/discourse/blob/main/discourse.sublime-project">discourse.sublime-project</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1797,7 +1797,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="jsapp" href="/discourse/discourse/blob/master/jsapp">jsapp</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="jsapp" href="/discourse/discourse/blob/main/jsapp">jsapp</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1816,7 +1816,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="lefthook.yml" href="/discourse/discourse/blob/master/lefthook.yml">lefthook.yml</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="lefthook.yml" href="/discourse/discourse/blob/main/lefthook.yml">lefthook.yml</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1835,7 +1835,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="package.json" href="/discourse/discourse/blob/master/package.json">package.json</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="package.json" href="/discourse/discourse/blob/main/package.json">package.json</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1854,7 +1854,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="translator.yml" href="/discourse/discourse/blob/master/translator.yml">translator.yml</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="translator.yml" href="/discourse/discourse/blob/main/translator.yml">translator.yml</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1873,7 +1873,7 @@
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="yarn.lock" href="/discourse/discourse/blob/master/yarn.lock">yarn.lock</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="yarn.lock" href="/discourse/discourse/blob/main/yarn.lock">yarn.lock</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1941,10 +1941,10 @@
 <li>If you're on Ubuntu, try the <a href="https://meta.discourse.org/t/beginners-guide-to-install-discourse-on-ubuntu-for-development/14727" rel="nofollow">Ubuntu development guide</a>.</li>
 <li>If you're on Windows, try the <a href="https://meta.discourse.org/t/beginners-guide-to-install-discourse-on-windows-10-for-development/75149" rel="nofollow">Windows 10 development guide</a>.</li>
 </ol>
-<p>If you're familiar with how Rails works and are comfortable setting up your own environment, you can also try out the <a href="/discourse/discourse/blob/master/docs/DEVELOPER-ADVANCED.md"><strong>Discourse Advanced Developer Guide</strong></a>, which is aimed primarily at Ubuntu and macOS environments.</p>
-<p>Before you get started, ensure you have the following minimum versions: <a href="https://www.ruby-lang.org/en/downloads/" rel="nofollow">Ruby 2.6+</a>, <a href="https://www.postgresql.org/download/" rel="nofollow">PostgreSQL 10+</a>, <a href="https://redis.io/download" rel="nofollow">Redis 4.0+</a>. If you're having trouble, please see our <a href="/discourse/discourse/blob/master/docs/TROUBLESHOOTING.md"><strong>TROUBLESHOOTING GUIDE</strong></a> first!</p>
+<p>If you're familiar with how Rails works and are comfortable setting up your own environment, you can also try out the <a href="/discourse/discourse/blob/main/docs/DEVELOPER-ADVANCED.md"><strong>Discourse Advanced Developer Guide</strong></a>, which is aimed primarily at Ubuntu and macOS environments.</p>
+<p>Before you get started, ensure you have the following minimum versions: <a href="https://www.ruby-lang.org/en/downloads/" rel="nofollow">Ruby 2.6+</a>, <a href="https://www.postgresql.org/download/" rel="nofollow">PostgreSQL 10+</a>, <a href="https://redis.io/download" rel="nofollow">Redis 4.0+</a>. If you're having trouble, please see our <a href="/discourse/discourse/blob/main/docs/TROUBLESHOOTING.md"><strong>TROUBLESHOOTING GUIDE</strong></a> first!</p>
 <h2><a id="user-content-setting-up-discourse" class="anchor" aria-hidden="true" href="#setting-up-discourse"><svg class="octicon octicon-link" viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M7.775 3.275a.75.75 0 001.06 1.06l1.25-1.25a2 2 0 112.83 2.83l-2.5 2.5a2 2 0 01-2.83 0 .75.75 0 00-1.06 1.06 3.5 3.5 0 004.95 0l2.5-2.5a3.5 3.5 0 00-4.95-4.95l-1.25 1.25zm-4.69 9.64a2 2 0 010-2.83l2.5-2.5a2 2 0 012.83 0 .75.75 0 001.06-1.06 3.5 3.5 0 00-4.95 0l-2.5 2.5a3.5 3.5 0 004.95 4.95l1.25-1.25a.75.75 0 00-1.06-1.06l-1.25 1.25a2 2 0 01-2.83 0z"></path></svg></a>Setting up Discourse</h2>
-<p>If you want to set up a Discourse forum for production use, see our <a href="/discourse/discourse/blob/master/docs/INSTALL.md"><strong>Discourse Install Guide</strong></a>.</p>
+<p>If you want to set up a Discourse forum for production use, see our <a href="/discourse/discourse/blob/main/docs/INSTALL.md"><strong>Discourse Install Guide</strong></a>.</p>
 <p>If you're looking for business class hosting, see <a href="https://www.discourse.org/buy/" rel="nofollow">discourse.org/buy</a>.</p>
 <h2><a id="user-content-requirements" class="anchor" aria-hidden="true" href="#requirements"><svg class="octicon octicon-link" viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M7.775 3.275a.75.75 0 001.06 1.06l1.25-1.25a2 2 0 112.83 2.83l-2.5 2.5a2 2 0 01-2.83 0 .75.75 0 00-1.06 1.06 3.5 3.5 0 004.95 0l2.5-2.5a3.5 3.5 0 00-4.95-4.95l-1.25 1.25zm-4.69 9.64a2 2 0 010-2.83l2.5-2.5a2 2 0 012.83 0 .75.75 0 001.06-1.06 3.5 3.5 0 00-4.95 0l-2.5 2.5a3.5 3.5 0 004.95 4.95l1.25-1.25a.75.75 0 00-1.06-1.06l-1.25 1.25a2 2 0 01-2.83 0z"></path></svg></a>Requirements</h2>
 <p>Discourse is built for the <em>next</em> 10 years of the Internet, so our requirements are high.</p>
@@ -1988,7 +1988,7 @@
 <li><a href="https://redis.io/" rel="nofollow">Redis</a> — We use Redis as a cache and for transient data.</li>
 <li><a href="https://www.browserstack.com/" rel="nofollow">BrowserStack</a> — We use BrowserStack to test on real devices and browsers.</li>
 </ul>
-<p>Plus <em>lots</em> of Ruby Gems, a complete list of which is at <a href="https://github.com/discourse/discourse/blob/master/Gemfile">/master/Gemfile</a>.</p>
+<p>Plus <em>lots</em> of Ruby Gems, a complete list of which is at <a href="https://github.com/discourse/discourse/blob/main/Gemfile">/master/Gemfile</a>.</p>
 <h2><a id="user-content-contributing" class="anchor" aria-hidden="true" href="#contributing"><svg class="octicon octicon-link" viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M7.775 3.275a.75.75 0 001.06 1.06l1.25-1.25a2 2 0 112.83 2.83l-2.5 2.5a2 2 0 01-2.83 0 .75.75 0 00-1.06 1.06 3.5 3.5 0 004.95 0l2.5-2.5a3.5 3.5 0 00-4.95-4.95l-1.25 1.25zm-4.69 9.64a2 2 0 010-2.83l2.5-2.5a2 2 0 012.83 0 .75.75 0 001.06-1.06 3.5 3.5 0 00-4.95 0l-2.5 2.5a3.5 3.5 0 004.95 4.95l1.25-1.25a.75.75 0 00-1.06-1.06l-1.25 1.25a2 2 0 01-2.83 0z"></path></svg></a>Contributing</h2>
 <p><a href="https://github.com/discourse/discourse/actions"><img src="https://github.com/discourse/discourse/workflows/CI/badge.svg" alt="Build Status" style="max-width:100%;"></a></p>
 <p>Discourse is <strong>100% free</strong> and <strong>open source</strong>. We encourage and support an active, healthy community that
@@ -1997,15 +1997,15 @@ accepts contributions from the public – including you!</p>
 <ol>
 <li>Please read the complete mission statements on <a href="https://www.discourse.org" rel="nofollow"><strong>discourse.org</strong></a>. Yes we actually believe this stuff; you should too.</li>
 <li>Read and sign the <a href="https://www.discourse.org/cla" rel="nofollow"><strong>Electronic Discourse Forums Contribution License Agreement</strong></a>.</li>
-<li>Dig into <a href="/discourse/discourse/blob/master/CONTRIBUTING.md"><strong>CONTRIBUTING.MD</strong></a>, which covers submitting bugs, requesting new features, preparing your code for a pull request, etc.</li>
-<li>Always strive to collaborate <a href="https://github.com/discourse/discourse/blob/master/docs/code-of-conduct.md">with mutual respect</a>.</li>
+<li>Dig into <a href="/discourse/discourse/blob/main/CONTRIBUTING.md"><strong>CONTRIBUTING.MD</strong></a>, which covers submitting bugs, requesting new features, preparing your code for a pull request, etc.</li>
+<li>Always strive to collaborate <a href="https://github.com/discourse/discourse/blob/main/docs/code-of-conduct.md">with mutual respect</a>.</li>
 <li>Not sure what to work on? <a href="https://meta.discourse.org/t/so-you-want-to-help-out-with-discourse/3823" rel="nofollow"><strong>We've got some ideas.</strong></a></li>
 </ol>
 <p>We look forward to seeing your pull requests!</p>
 <h2><a id="user-content-security" class="anchor" aria-hidden="true" href="#security"><svg class="octicon octicon-link" viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M7.775 3.275a.75.75 0 001.06 1.06l1.25-1.25a2 2 0 112.83 2.83l-2.5 2.5a2 2 0 01-2.83 0 .75.75 0 00-1.06 1.06 3.5 3.5 0 004.95 0l2.5-2.5a3.5 3.5 0 00-4.95-4.95l-1.25 1.25zm-4.69 9.64a2 2 0 010-2.83l2.5-2.5a2 2 0 012.83 0 .75.75 0 001.06-1.06 3.5 3.5 0 00-4.95 0l-2.5 2.5a3.5 3.5 0 004.95 4.95l1.25-1.25a.75.75 0 00-1.06-1.06l-1.25 1.25a2 2 0 01-2.83 0z"></path></svg></a>Security</h2>
-<p>We take security very seriously at Discourse; all our code is 100% open source and peer reviewed. Please read <a href="https://github.com/discourse/discourse/blob/master/docs/SECURITY.md">our security guide</a> for an overview of security measures in Discourse, or if you wish to report a security issue.</p>
+<p>We take security very seriously at Discourse; all our code is 100% open source and peer reviewed. Please read <a href="https://github.com/discourse/discourse/blob/main/docs/SECURITY.md">our security guide</a> for an overview of security measures in Discourse, or if you wish to report a security issue.</p>
 <h2><a id="user-content-the-discourse-team" class="anchor" aria-hidden="true" href="#the-discourse-team"><svg class="octicon octicon-link" viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M7.775 3.275a.75.75 0 001.06 1.06l1.25-1.25a2 2 0 112.83 2.83l-2.5 2.5a2 2 0 01-2.83 0 .75.75 0 00-1.06 1.06 3.5 3.5 0 004.95 0l2.5-2.5a3.5 3.5 0 00-4.95-4.95l-1.25 1.25zm-4.69 9.64a2 2 0 010-2.83l2.5-2.5a2 2 0 012.83 0 .75.75 0 001.06-1.06 3.5 3.5 0 00-4.95 0l-2.5 2.5a3.5 3.5 0 004.95 4.95l1.25-1.25a.75.75 0 00-1.06-1.06l-1.25 1.25a2 2 0 01-2.83 0z"></path></svg></a>The Discourse Team</h2>
-<p>The original Discourse code contributors can be found in <a href="/discourse/discourse/blob/master/docs/AUTHORS.md"><strong>AUTHORS.MD</strong></a>. For a complete list of the many individuals that contributed to the design and implementation of Discourse, please refer to <a href="https://blog.discourse.org/2013/02/the-discourse-team/" rel="nofollow">the official Discourse blog</a> and <a href="https://github.com/discourse/discourse/contributors">GitHub's list of contributors</a>.</p>
+<p>The original Discourse code contributors can be found in <a href="/discourse/discourse/blob/main/docs/AUTHORS.md"><strong>AUTHORS.MD</strong></a>. For a complete list of the many individuals that contributed to the design and implementation of Discourse, please refer to <a href="https://blog.discourse.org/2013/02/the-discourse-team/" rel="nofollow">the official Discourse blog</a> and <a href="https://github.com/discourse/discourse/contributors">GitHub's list of contributors</a>.</p>
 <h2><a id="user-content-copyright--license" class="anchor" aria-hidden="true" href="#copyright--license"><svg class="octicon octicon-link" viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M7.775 3.275a.75.75 0 001.06 1.06l1.25-1.25a2 2 0 112.83 2.83l-2.5 2.5a2 2 0 01-2.83 0 .75.75 0 00-1.06 1.06 3.5 3.5 0 004.95 0l2.5-2.5a3.5 3.5 0 00-4.95-4.95l-1.25 1.25zm-4.69 9.64a2 2 0 010-2.83l2.5-2.5a2 2 0 012.83 0 .75.75 0 001.06-1.06 3.5 3.5 0 00-4.95 0l-2.5 2.5a3.5 3.5 0 004.95 4.95l1.25-1.25a.75.75 0 00-1.06-1.06l-1.25 1.25a2 2 0 01-2.83 0z"></path></svg></a>Copyright / License</h2>
 <p>Copyright 2014 - 2020 Civilized Discourse Construction Kit, Inc.</p>
 <p>Licensed under the GNU General Public License Version 2.0 (or later);
@@ -2078,7 +2078,7 @@ limitations under the License.</p>
 
   <h3 class="sr-only">License</h3>
   <div class="mt-3">
-    <a href="/discourse/discourse/blob/master/LICENSE.txt" class="muted-link" >
+    <a href="/discourse/discourse/blob/main/LICENSE.txt" class="muted-link" >
       <svg class="octicon octicon-law mr-2" height="16" viewBox="0 0 16 16" version="1.1" width="16" aria-hidden="true"><path fill-rule="evenodd" d="M8.75.75a.75.75 0 00-1.5 0V2h-.984c-.305 0-.604.08-.869.23l-1.288.737A.25.25 0 013.984 3H1.75a.75.75 0 000 1.5h.428L.066 9.192a.75.75 0 00.154.838l.53-.53-.53.53v.001l.002.002.002.002.006.006.016.015.045.04a3.514 3.514 0 00.686.45A4.492 4.492 0 003 11c.88 0 1.556-.22 2.023-.454a3.515 3.515 0 00.686-.45l.045-.04.016-.015.006-.006.002-.002.001-.002L5.25 9.5l.53.53a.75.75 0 00.154-.838L3.822 4.5h.162c.305 0 .604-.08.869-.23l1.289-.737a.25.25 0 01.124-.033h.984V13h-2.5a.75.75 0 000 1.5h6.5a.75.75 0 000-1.5h-2.5V3.5h.984a.25.25 0 01.124.033l1.29.736c.264.152.563.231.868.231h.162l-2.112 4.692a.75.75 0 00.154.838l.53-.53-.53.53v.001l.002.002.002.002.006.006.016.015.045.04a3.517 3.517 0 00.686.45A4.492 4.492 0 0013 11c.88 0 1.556-.22 2.023-.454a3.512 3.512 0 00.686-.45l.045-.04.01-.01.006-.005.006-.006.002-.002.001-.002-.529-.531.53.53a.75.75 0 00.154-.838L13.823 4.5h.427a.75.75 0 000-1.5h-2.234a.25.25 0 01-.124-.033l-1.29-.736A1.75 1.75 0 009.735 2H8.75V.75zM1.695 9.227c.285.135.718.273 1.305.273s1.02-.138 1.305-.273L3 6.327l-1.305 2.9zm10 0c.285.135.718.273 1.305.273s1.02-.138 1.305-.273L13 6.327l-1.305 2.9z"></path></svg>
         View license
     </a>
diff --git a/spec/fixtures/onebox/githubfolder.response b/spec/fixtures/onebox/githubfolder.response
index 6e2ae42221..81198e8965 100644
--- a/spec/fixtures/onebox/githubfolder.response
+++ b/spec/fixtures/onebox/githubfolder.response
@@ -105,14 +105,14 @@
   <meta http-equiv="x-pjax-version" content="54c2d4c4c03877e502ae56a38c2d98b6b0af19468dbeb53e4c171c0edc86d5fc">
 
 
-        <link href="https://github.com/discourse/discourse/commits/master.atom" rel="alternate" title="Recent Commits to discourse:master" type="application/atom+xml">
+        <link href="https://github.com/discourse/discourse/commits/main.atom" rel="alternate" title="Recent Commits to discourse:master" type="application/atom+xml">
 
   <meta name="go-import" content="github.com/discourse/discourse git https://github.com/discourse/discourse.git">
 
   <meta name="octolytics-dimension-user_id" content="3220138" /><meta name="octolytics-dimension-user_login" content="discourse" /><meta name="octolytics-dimension-repository_id" content="7569578" /><meta name="octolytics-dimension-repository_nwo" content="discourse/discourse" /><meta name="octolytics-dimension-repository_public" content="true" /><meta name="octolytics-dimension-repository_is_fork" content="false" /><meta name="octolytics-dimension-repository_network_root_id" content="7569578" /><meta name="octolytics-dimension-repository_network_root_nwo" content="discourse/discourse" /><meta name="octolytics-dimension-repository_explore_github_marketplace_ci_cta_shown" content="false" />
 
 
-    <link rel="canonical" href="https://github.com/discourse/discourse/tree/master/spec/fixtures" data-pjax-transient>
+    <link rel="canonical" href="https://github.com/discourse/discourse/tree/main/spec/fixtures" data-pjax-transient>
 
 
   <meta name="browser-stats-url" content="https://api.github.com/_private/browser/stats">
@@ -158,7 +158,7 @@
         <div class="d-flex flex-items-center">
               <a href="/join?ref_cta=Sign+up&amp;ref_loc=header+logged+out&amp;ref_page=%2F%3Cuser-name%3E%2F%3Crepo-name%3E%2Ffiles%2Fdisambiguate&amp;source=header-repo"
                 class="d-inline-block d-lg-none f5 text-white no-underline border border-gray-dark rounded-2 px-2 py-1 mr-3 mr-sm-5"
-                data-hydro-click="{&quot;event_type&quot;:&quot;authentication.click&quot;,&quot;payload&quot;:{&quot;location_in_page&quot;:&quot;site header&quot;,&quot;repository_id&quot;:null,&quot;auth_type&quot;:&quot;SIGN_UP&quot;,&quot;originating_url&quot;:&quot;https://github.com/discourse/discourse/tree/master/spec/fixtures&quot;,&quot;user_id&quot;:null}}" data-hydro-click-hmac="15792d7508105d8b3cf7a7682f1f9ff6ef0dcbe6ea0cd1122732d8bea435cb62"
+                data-hydro-click="{&quot;event_type&quot;:&quot;authentication.click&quot;,&quot;payload&quot;:{&quot;location_in_page&quot;:&quot;site header&quot;,&quot;repository_id&quot;:null,&quot;auth_type&quot;:&quot;SIGN_UP&quot;,&quot;originating_url&quot;:&quot;https://github.com/discourse/discourse/tree/main/spec/fixtures&quot;,&quot;user_id&quot;:null}}" data-hydro-click-hmac="15792d7508105d8b3cf7a7682f1f9ff6ef0dcbe6ea0cd1122732d8bea435cb62"
                 data-ga-click="Sign up, click to sign up for account, ref_page:/&lt;user-name&gt;/&lt;repo-name&gt;/files/disambiguate;ref_cta:Sign up;ref_loc:header logged out">
                 Sign&nbsp;up
               </a>
@@ -431,13 +431,13 @@
 
         <a href="/login?return_to=%2Fdiscourse%2Fdiscourse%2Ftree%2Fmaster%2Fspec%2Ffixtures"
           class="HeaderMenu-link no-underline mr-3"
-          data-hydro-click="{&quot;event_type&quot;:&quot;authentication.click&quot;,&quot;payload&quot;:{&quot;location_in_page&quot;:&quot;site header menu&quot;,&quot;repository_id&quot;:null,&quot;auth_type&quot;:&quot;SIGN_UP&quot;,&quot;originating_url&quot;:&quot;https://github.com/discourse/discourse/tree/master/spec/fixtures&quot;,&quot;user_id&quot;:null}}" data-hydro-click-hmac="cd2e5eaef831676675daf05be31d25cc5e281ff5a6ca138b4f785f0792646077"
+          data-hydro-click="{&quot;event_type&quot;:&quot;authentication.click&quot;,&quot;payload&quot;:{&quot;location_in_page&quot;:&quot;site header menu&quot;,&quot;repository_id&quot;:null,&quot;auth_type&quot;:&quot;SIGN_UP&quot;,&quot;originating_url&quot;:&quot;https://github.com/discourse/discourse/tree/main/spec/fixtures&quot;,&quot;user_id&quot;:null}}" data-hydro-click-hmac="cd2e5eaef831676675daf05be31d25cc5e281ff5a6ca138b4f785f0792646077"
           data-ga-click="(Logged out) Header, clicked Sign in, text:sign-in">
           Sign&nbsp;in
         </a>
             <a href="/join?ref_cta=Sign+up&amp;ref_loc=header+logged+out&amp;ref_page=%2F%3Cuser-name%3E%2F%3Crepo-name%3E%2Ffiles%2Fdisambiguate&amp;source=header-repo&amp;source_repo=discourse%2Fdiscourse"
               class="HeaderMenu-link d-inline-block no-underline border border-gray-dark rounded-1 px-2 py-1"
-              data-hydro-click="{&quot;event_type&quot;:&quot;authentication.click&quot;,&quot;payload&quot;:{&quot;location_in_page&quot;:&quot;site header menu&quot;,&quot;repository_id&quot;:null,&quot;auth_type&quot;:&quot;SIGN_UP&quot;,&quot;originating_url&quot;:&quot;https://github.com/discourse/discourse/tree/master/spec/fixtures&quot;,&quot;user_id&quot;:null}}" data-hydro-click-hmac="cd2e5eaef831676675daf05be31d25cc5e281ff5a6ca138b4f785f0792646077"
+              data-hydro-click="{&quot;event_type&quot;:&quot;authentication.click&quot;,&quot;payload&quot;:{&quot;location_in_page&quot;:&quot;site header menu&quot;,&quot;repository_id&quot;:null,&quot;auth_type&quot;:&quot;SIGN_UP&quot;,&quot;originating_url&quot;:&quot;https://github.com/discourse/discourse/tree/main/spec/fixtures&quot;,&quot;user_id&quot;:null}}" data-hydro-click-hmac="cd2e5eaef831676675daf05be31d25cc5e281ff5a6ca138b4f785f0792646077"
               data-ga-click="Sign up, click to sign up for account, ref_page:/&lt;user-name&gt;/&lt;repo-name&gt;/files/disambiguate;ref_cta:Sign up;ref_loc:header logged out">
               Sign&nbsp;up
             </a>
@@ -524,7 +524,7 @@
           <ul class="pagehead-actions flex-shrink-0 d-none d-md-inline" style="padding: 2px 0;">
 
   <li>
-          <a class="tooltipped tooltipped-s btn btn-sm btn-with-count" aria-label="You must be signed in to watch a repository" rel="nofollow" data-hydro-click="{&quot;event_type&quot;:&quot;authentication.click&quot;,&quot;payload&quot;:{&quot;location_in_page&quot;:&quot;notification subscription menu watch&quot;,&quot;repository_id&quot;:null,&quot;auth_type&quot;:&quot;LOG_IN&quot;,&quot;originating_url&quot;:&quot;https://github.com/discourse/discourse/tree/master/spec/fixtures&quot;,&quot;user_id&quot;:null}}" data-hydro-click-hmac="405972d89d23ad57a208a6b762c908977e8632ed4412feebe6aabd8982c3dc67" href="/login?return_to=%2Fdiscourse%2Fdiscourse">
+          <a class="tooltipped tooltipped-s btn btn-sm btn-with-count" aria-label="You must be signed in to watch a repository" rel="nofollow" data-hydro-click="{&quot;event_type&quot;:&quot;authentication.click&quot;,&quot;payload&quot;:{&quot;location_in_page&quot;:&quot;notification subscription menu watch&quot;,&quot;repository_id&quot;:null,&quot;auth_type&quot;:&quot;LOG_IN&quot;,&quot;originating_url&quot;:&quot;https://github.com/discourse/discourse/tree/main/spec/fixtures&quot;,&quot;user_id&quot;:null}}" data-hydro-click-hmac="405972d89d23ad57a208a6b762c908977e8632ed4412feebe6aabd8982c3dc67" href="/login?return_to=%2Fdiscourse%2Fdiscourse">
     <svg class="octicon octicon-eye" height="16" viewBox="0 0 16 16" version="1.1" width="16" aria-hidden="true"><path fill-rule="evenodd" d="M1.679 7.932c.412-.621 1.242-1.75 2.366-2.717C5.175 4.242 6.527 3.5 8 3.5c1.473 0 2.824.742 3.955 1.715 1.124.967 1.954 2.096 2.366 2.717a.119.119 0 010 .136c-.412.621-1.242 1.75-2.366 2.717C10.825 11.758 9.473 12.5 8 12.5c-1.473 0-2.824-.742-3.955-1.715C2.92 9.818 2.09 8.69 1.679 8.068a.119.119 0 010-.136zM8 2c-1.981 0-3.67.992-4.933 2.078C1.797 5.169.88 6.423.43 7.1a1.619 1.619 0 000 1.798c.45.678 1.367 1.932 2.637 3.024C4.329 13.008 6.019 14 8 14c1.981 0 3.67-.992 4.933-2.078 1.27-1.091 2.187-2.345 2.637-3.023a1.619 1.619 0 000-1.798c-.45-.678-1.367-1.932-2.637-3.023C11.671 2.992 9.981 2 8 2zm0 8a2 2 0 100-4 2 2 0 000 4z"></path></svg>
     Watch
 </a>    <a class="social-count" href="/discourse/discourse/watchers"
@@ -535,7 +535,7 @@
   </li>
 
   <li>
-          <a class="btn btn-sm btn-with-count  tooltipped tooltipped-s" aria-label="You must be signed in to star a repository" rel="nofollow" data-hydro-click="{&quot;event_type&quot;:&quot;authentication.click&quot;,&quot;payload&quot;:{&quot;location_in_page&quot;:&quot;star button&quot;,&quot;repository_id&quot;:7569578,&quot;auth_type&quot;:&quot;LOG_IN&quot;,&quot;originating_url&quot;:&quot;https://github.com/discourse/discourse/tree/master/spec/fixtures&quot;,&quot;user_id&quot;:null}}" data-hydro-click-hmac="fa965363a7035432c2582ba60c32caf61b31df59e448228b4ef6d44280819124" href="/login?return_to=%2Fdiscourse%2Fdiscourse">
+          <a class="btn btn-sm btn-with-count  tooltipped tooltipped-s" aria-label="You must be signed in to star a repository" rel="nofollow" data-hydro-click="{&quot;event_type&quot;:&quot;authentication.click&quot;,&quot;payload&quot;:{&quot;location_in_page&quot;:&quot;star button&quot;,&quot;repository_id&quot;:7569578,&quot;auth_type&quot;:&quot;LOG_IN&quot;,&quot;originating_url&quot;:&quot;https://github.com/discourse/discourse/tree/main/spec/fixtures&quot;,&quot;user_id&quot;:null}}" data-hydro-click-hmac="fa965363a7035432c2582ba60c32caf61b31df59e448228b4ef6d44280819124" href="/login?return_to=%2Fdiscourse%2Fdiscourse">
       <svg class="octicon octicon-star v-align-text-bottom" height="16" viewBox="0 0 16 16" version="1.1" width="16" aria-hidden="true"><path fill-rule="evenodd" d="M8 .25a.75.75 0 01.673.418l1.882 3.815 4.21.612a.75.75 0 01.416 1.279l-3.046 2.97.719 4.192a.75.75 0 01-1.088.791L8 12.347l-3.766 1.98a.75.75 0 01-1.088-.79l.72-4.194L.818 6.374a.75.75 0 01.416-1.28l4.21-.611L7.327.668A.75.75 0 018 .25zm0 2.445L6.615 5.5a.75.75 0 01-.564.41l-3.097.45 2.24 2.184a.75.75 0 01.216.664l-.528 3.084 2.769-1.456a.75.75 0 01.698 0l2.77 1.456-.53-3.084a.75.75 0 01.216-.664l2.24-2.183-3.096-.45a.75.75 0 01-.564-.41L8 2.694v.001z"></path></svg>
       Star
 </a>
@@ -547,7 +547,7 @@
   </li>
 
   <li>
-        <a class="btn btn-sm btn-with-count tooltipped tooltipped-s" aria-label="You must be signed in to fork a repository" rel="nofollow" data-hydro-click="{&quot;event_type&quot;:&quot;authentication.click&quot;,&quot;payload&quot;:{&quot;location_in_page&quot;:&quot;repo details fork button&quot;,&quot;repository_id&quot;:7569578,&quot;auth_type&quot;:&quot;LOG_IN&quot;,&quot;originating_url&quot;:&quot;https://github.com/discourse/discourse/tree/master/spec/fixtures&quot;,&quot;user_id&quot;:null}}" data-hydro-click-hmac="f52817d4db9c640daaa9cbd6de77641556fcd6f08035601bdb7bab7cdec04960" href="/login?return_to=%2Fdiscourse%2Fdiscourse">
+        <a class="btn btn-sm btn-with-count tooltipped tooltipped-s" aria-label="You must be signed in to fork a repository" rel="nofollow" data-hydro-click="{&quot;event_type&quot;:&quot;authentication.click&quot;,&quot;payload&quot;:{&quot;location_in_page&quot;:&quot;repo details fork button&quot;,&quot;repository_id&quot;:7569578,&quot;auth_type&quot;:&quot;LOG_IN&quot;,&quot;originating_url&quot;:&quot;https://github.com/discourse/discourse/tree/main/spec/fixtures&quot;,&quot;user_id&quot;:null}}" data-hydro-click-hmac="f52817d4db9c640daaa9cbd6de77641556fcd6f08035601bdb7bab7cdec04960" href="/login?return_to=%2Fdiscourse%2Fdiscourse">
           <svg class="octicon octicon-repo-forked" viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M5 3.25a.75.75 0 11-1.5 0 .75.75 0 011.5 0zm0 2.122a2.25 2.25 0 10-1.5 0v.878A2.25 2.25 0 005.75 8.5h1.5v2.128a2.251 2.251 0 101.5 0V8.5h1.5a2.25 2.25 0 002.25-2.25v-.878a2.25 2.25 0 10-1.5 0v.878a.75.75 0 01-.75.75h-4.5A.75.75 0 015 6.25v-.878zm3.75 7.378a.75.75 0 11-1.5 0 .75.75 0 011.5 0zm3-8.75a.75.75 0 100-1.5.75.75 0 000 1.5z"></path></svg>
           Fork
 </a>
@@ -664,18 +664,18 @@
 
     <div class="flex-1 mx-2 flex-self-center f4">
       <div class="d-none d-sm-block">
-        <span class="js-repo-root text-bold"><span class="js-path-segment d-inline-block wb-break-all"><a data-pjax="true" href="/discourse/discourse"><span>discourse</span></a></span></span><span class="mx-1">/</span><span class="js-path-segment d-inline-block wb-break-all"><a data-pjax="true" href="/discourse/discourse/tree/master/spec"><span>spec</span></a></span><span class="mx-1">/</span><strong class="final-path">fixtures</strong><span class="mx-1">/</span>
+        <span class="js-repo-root text-bold"><span class="js-path-segment d-inline-block wb-break-all"><a data-pjax="true" href="/discourse/discourse"><span>discourse</span></a></span></span><span class="mx-1">/</span><span class="js-path-segment d-inline-block wb-break-all"><a data-pjax="true" href="/discourse/discourse/tree/main/spec"><span>spec</span></a></span><span class="mx-1">/</span><strong class="final-path">fixtures</strong><span class="mx-1">/</span>
       </div>
     </div>
 
     <div class="d-flex">
-      <a class="btn mr-2 d-none d-md-block" data-hydro-click="{&quot;event_type&quot;:&quot;repository.click&quot;,&quot;payload&quot;:{&quot;target&quot;:&quot;FIND_FILE_BUTTON&quot;,&quot;repository_id&quot;:7569578,&quot;originating_url&quot;:&quot;https://github.com/discourse/discourse/tree/master/spec/fixtures&quot;,&quot;user_id&quot;:null}}" data-hydro-click-hmac="557e83be024a36d7baeb2ebfdab8c7caa1a4a09099ec10ecaa4a7d73fd957017" data-ga-click="Repository, find file, location:repo overview" data-hotkey="t" data-pjax="true" href="/discourse/discourse/find/master">
+      <a class="btn mr-2 d-none d-md-block" data-hydro-click="{&quot;event_type&quot;:&quot;repository.click&quot;,&quot;payload&quot;:{&quot;target&quot;:&quot;FIND_FILE_BUTTON&quot;,&quot;repository_id&quot;:7569578,&quot;originating_url&quot;:&quot;https://github.com/discourse/discourse/tree/main/spec/fixtures&quot;,&quot;user_id&quot;:null}}" data-hydro-click-hmac="557e83be024a36d7baeb2ebfdab8c7caa1a4a09099ec10ecaa4a7d73fd957017" data-ga-click="Repository, find file, location:repo overview" data-hotkey="t" data-pjax="true" href="/discourse/discourse/find/master">
         Go to file
 </a>
     </div>
   </div>
 
-  <div class="f4 mt-3 mb-3 d-sm-none"><span class="js-repo-root text-bold"><span class="js-path-segment d-inline-block wb-break-all"><a data-pjax="true" href="/discourse/discourse"><span>discourse</span></a></span></span><span class="mx-1">/</span><span class="js-path-segment d-inline-block wb-break-all"><a data-pjax="true" href="/discourse/discourse/tree/master/spec"><span>spec</span></a></span><span class="mx-1">/</span><strong class="final-path">fixtures</strong><span class="separator mx-1">/</span></div>
+  <div class="f4 mt-3 mb-3 d-sm-none"><span class="js-repo-root text-bold"><span class="js-path-segment d-inline-block wb-break-all"><a data-pjax="true" href="/discourse/discourse"><span>discourse</span></a></span></span><span class="mx-1">/</span><span class="js-path-segment d-inline-block wb-break-all"><a data-pjax="true" href="/discourse/discourse/tree/main/spec"><span>spec</span></a></span><span class="mx-1">/</span><strong class="final-path">fixtures</strong><span class="separator mx-1">/</span></div>
 
 
 
@@ -797,7 +797,7 @@ Co-authored-by: Gerhard Schlager &lt;mail@gerhard-schlager.at&gt;</pre>
         <h2 class="sr-only">Git stats</h2>
         <ul class="list-style-none d-flex">
           <li class="ml-0 ml-md-3">
-            <a data-pjax href="/discourse/discourse/commits/master/spec/fixtures" class="pl-3 pr-3 py-3 p-md-0 mt-n3 mb-n3 mr-n3 m-md-0 link-gray-dark no-underline no-wrap">
+            <a data-pjax href="/discourse/discourse/commits/main/spec/fixtures" class="pl-3 pr-3 py-3 p-md-0 mt-n3 mb-n3 mr-n3 m-md-0 link-gray-dark no-underline no-wrap">
               <svg class="octicon octicon-history text-gray" height="16" viewBox="0 0 16 16" version="1.1" width="16" aria-hidden="true"><path fill-rule="evenodd" d="M1.643 3.143L.427 1.927A.25.25 0 000 2.104V5.75c0 .138.112.25.25.25h3.646a.25.25 0 00.177-.427L2.715 4.215a6.5 6.5 0 11-1.18 4.458.75.75 0 10-1.493.154 8.001 8.001 0 101.6-5.684zM7.75 4a.75.75 0 01.75.75v2.992l2.028.812a.75.75 0 01-.557 1.392l-2.5-1A.75.75 0 017 8.25v-3.5A.75.75 0 017.75 4z"></path></svg>
               <span class="d-none d-sm-inline">
                   <strong>History</strong>
@@ -829,7 +829,7 @@ Co-authored-by: Gerhard Schlager &lt;mail@gerhard-schlager.at&gt;</pre>
       </div>
         <div role="row" class="Box-row Box-row--focus-gray p-0 d-flex js-navigation-item" >
           <div role="rowheader" class="flex-auto min-width-0 col-md-2">
-            <a rel="nofollow" title="Go to parent directory" class="js-navigation-open d-block py-2 px-3" href="/discourse/discourse/tree/master/spec">
+            <a rel="nofollow" title="Go to parent directory" class="js-navigation-open d-block py-2 px-3" href="/discourse/discourse/tree/main/spec">
               <span class="text-bold text-center d-inline-block" style="min-width: 16px;">. .</span>
 </a>          </div>
           <div role="gridcell" class="d-none d-md-block"></div>
@@ -843,7 +843,7 @@ Co-authored-by: Gerhard Schlager &lt;mail@gerhard-schlager.at&gt;</pre>
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="backups" href="/discourse/discourse/tree/master/spec/fixtures/backups">backups</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="backups" href="/discourse/discourse/tree/main/spec/fixtures/backups">backups</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -866,7 +866,7 @@ This also ensures that restoring a backup works when it was created with the wro
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="csv" href="/discourse/discourse/tree/master/spec/fixtures/csv">csv</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="csv" href="/discourse/discourse/tree/main/spec/fixtures/csv">csv</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -887,7 +887,7 @@ This also ensures that restoring a backup works when it was created with the wro
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="db" href="/discourse/discourse/tree/master/spec/fixtures/db">db</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="db" href="/discourse/discourse/tree/main/spec/fixtures/db">db</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -910,7 +910,7 @@ The `EXECUTE FUNCTION` syntax for `CREATE TRIGGER` statements was introduced in
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="emails" href="/discourse/discourse/tree/master/spec/fixtures/emails">emails</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="emails" href="/discourse/discourse/tree/main/spec/fixtures/emails">emails</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -935,7 +935,7 @@ This is a PR of the renaming whitelist to allowlist and blacklist to the blockli
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="encodings" href="/discourse/discourse/tree/master/spec/fixtures/encodings">encodings</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="encodings" href="/discourse/discourse/tree/main/spec/fixtures/encodings">encodings</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -956,7 +956,7 @@ This is a PR of the renaming whitelist to allowlist and blacklist to the blockli
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="feed" href="/discourse/discourse/tree/master/spec/fixtures/feed">feed</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="feed" href="/discourse/discourse/tree/main/spec/fixtures/feed">feed</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -977,7 +977,7 @@ This is a PR of the renaming whitelist to allowlist and blacklist to the blockli
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="i18n" href="/discourse/discourse/tree/master/spec/fixtures/i18n">i18n</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="i18n" href="/discourse/discourse/tree/main/spec/fixtures/i18n">i18n</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1000,7 +1000,7 @@ follow-up to 6d8eb9c1" class="link-gray" href="/discourse/discourse/commit/a77d8
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="images" href="/discourse/discourse/tree/master/spec/fixtures/images">images</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="images" href="/discourse/discourse/tree/main/spec/fixtures/images">images</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1029,7 +1029,7 @@ follow-up to 6d8eb9c1" class="link-gray" href="/discourse/discourse/commit/a77d8
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="json" href="/discourse/discourse/tree/master/spec/fixtures/json">json</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="json" href="/discourse/discourse/tree/main/spec/fixtures/json">json</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1066,7 +1066,7 @@ follow-up to 6d8eb9c1" class="link-gray" href="/discourse/discourse/commit/a77d8
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="md" href="/discourse/discourse/tree/master/spec/fixtures/md">md</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="md" href="/discourse/discourse/tree/main/spec/fixtures/md">md</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1087,7 +1087,7 @@ follow-up to 6d8eb9c1" class="link-gray" href="/discourse/discourse/commit/a77d8
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="media" href="/discourse/discourse/tree/master/spec/fixtures/media">media</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="media" href="/discourse/discourse/tree/main/spec/fixtures/media">media</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1116,7 +1116,7 @@ See https://meta.discourse.org/t/cannot-download-non-image-media-files-original-
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="mmdb" href="/discourse/discourse/tree/master/spec/fixtures/mmdb">mmdb</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="mmdb" href="/discourse/discourse/tree/main/spec/fixtures/mmdb">mmdb</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1145,7 +1145,7 @@ See https://meta.discourse.org/t/cannot-download-non-image-media-files-original-
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="multisite" href="/discourse/discourse/tree/master/spec/fixtures/multisite">multisite</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="multisite" href="/discourse/discourse/tree/main/spec/fixtures/multisite">multisite</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1166,7 +1166,7 @@ See https://meta.discourse.org/t/cannot-download-non-image-media-files-original-
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="onebox" href="/discourse/discourse/tree/master/spec/fixtures/onebox">onebox</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="onebox" href="/discourse/discourse/tree/main/spec/fixtures/onebox">onebox</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1219,7 +1219,7 @@ Co-authored-by: Gerhard Schlager &lt;mail@gerhard-schlager.at&gt;" class="link-g
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="pdf" href="/discourse/discourse/tree/master/spec/fixtures/pdf">pdf</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="pdf" href="/discourse/discourse/tree/main/spec/fixtures/pdf">pdf</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1244,7 +1244,7 @@ Co-authored-by: Maja Komel &lt;maja.komel@gmail.com&gt;" class="link-gray" href=
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="plugins" href="/discourse/discourse/tree/master/spec/fixtures/plugins">plugins</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="plugins" href="/discourse/discourse/tree/main/spec/fixtures/plugins">plugins</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1270,7 +1270,7 @@ moment." class="link-gray" href="/discourse/discourse/commit/cdb7ddc258c6a459bdf
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="scss" href="/discourse/discourse/tree/master/spec/fixtures/scss">scss</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="scss" href="/discourse/discourse/tree/main/spec/fixtures/scss">scss</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1291,7 +1291,7 @@ moment." class="link-gray" href="/discourse/discourse/commit/cdb7ddc258c6a459bdf
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="site_settings" href="/discourse/discourse/tree/master/spec/fixtures/site_settings">site_settings</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="site_settings" href="/discourse/discourse/tree/main/spec/fixtures/site_settings">site_settings</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1316,7 +1316,7 @@ Noted:
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="theme_settings" href="/discourse/discourse/tree/master/spec/fixtures/theme_settings">theme_settings</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="theme_settings" href="/discourse/discourse/tree/main/spec/fixtures/theme_settings">theme_settings</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1337,7 +1337,7 @@ Noted:
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="themes" href="/discourse/discourse/tree/master/spec/fixtures/themes">themes</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="themes" href="/discourse/discourse/tree/main/spec/fixtures/themes">themes</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
@@ -1378,7 +1378,7 @@ This pull request is related to https://meta.discourse.org/t/uploaded-js-file-fo
           </div>
 
           <div role="rowheader" class="flex-auto min-width-0 col-md-2 mr-3">
-            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="woff2" href="/discourse/discourse/tree/master/spec/fixtures/woff2">woff2</a></span>
+            <span class="css-truncate css-truncate-target d-block width-fit"><a class="js-navigation-open link-gray-dark" title="woff2" href="/discourse/discourse/tree/main/spec/fixtures/woff2">woff2</a></span>
           </div>
 
           <div role="gridcell" class="flex-auto min-width-0 d-none d-md-block col-5 mr-3" >
diff --git a/spec/lib/onebox/engine/github_folder_onebox_spec.rb b/spec/lib/onebox/engine/github_folder_onebox_spec.rb
index d050ec18e2..6a9d0c18a3 100644
--- a/spec/lib/onebox/engine/github_folder_onebox_spec.rb
+++ b/spec/lib/onebox/engine/github_folder_onebox_spec.rb
@@ -5,8 +5,8 @@ require "rails_helper"
 describe Onebox::Engine::GithubFolderOnebox do
   context 'without fragments' do
     before do
-      @link = "https://github.com/discourse/discourse/tree/master/spec/fixtures"
-      @uri = "https://github.com/discourse/discourse/tree/master/spec/fixtures"
+      @link = "https://github.com/discourse/discourse/tree/main/spec/fixtures"
+      @uri = "https://github.com/discourse/discourse/tree/main/spec/fixtures"
 
       stub_request(:get, @uri).to_return(status: 200, body: onebox_response(described_class.onebox_name))
     end
@@ -16,7 +16,7 @@ describe Onebox::Engine::GithubFolderOnebox do
 
     describe "#to_html" do
       it "includes link to folder with truncated display path" do
-        expect(html).to include("<a href=\"https://github.com/discourse/discourse/tree/master/spec/fixtures\" target=\"_blank\" rel=\"noopener\">master/spec/fixtures</a>")
+        expect(html).to include("<a href=\"https://github.com/discourse/discourse/tree/main/spec/fixtures\" target=\"_blank\" rel=\"noopener\">master/spec/fixtures</a>")
       end
 
       it "includes repository name" do

From 76a11e6dc957d981ea130cf5588cc3d9dd30f471 Mon Sep 17 00:00:00 2001
From: Michael Brown <michael.brown@discourse.org>
Date: Mon, 19 Jul 2021 12:41:48 -0400
Subject: [PATCH 33/77] DEV: fix test (missed a reference to master)

---
 spec/fixtures/onebox/githubfolder.response          | 2 +-
 spec/lib/onebox/engine/github_folder_onebox_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/fixtures/onebox/githubfolder.response b/spec/fixtures/onebox/githubfolder.response
index 81198e8965..6de88c2be8 100644
--- a/spec/fixtures/onebox/githubfolder.response
+++ b/spec/fixtures/onebox/githubfolder.response
@@ -650,7 +650,7 @@
       <span class="dropdown-caret"></span>
     </summary>
 
-    <details-menu class="SelectMenu SelectMenu--hasFilter" src="/discourse/discourse/refs/master/spec/fixtures?source_action=disambiguate&amp;source_controller=files" preload>
+    <details-menu class="SelectMenu SelectMenu--hasFilter" src="/discourse/discourse/refs/main/spec/fixtures?source_action=disambiguate&amp;source_controller=files" preload>
       <div class="SelectMenu-modal">
         <include-fragment class="SelectMenu-loading" aria-label="Menu is loading">
           <svg class="octicon octicon-octoface anim-pulse" height="32" viewBox="0 0 24 24" version="1.1" width="32" aria-hidden="true"><path d="M7.75 11c-.69 0-1.25.56-1.25 1.25v1.5a1.25 1.25 0 102.5 0v-1.5C9 11.56 8.44 11 7.75 11zm1.27 4.5a.469.469 0 01.48-.5h5a.47.47 0 01.48.5c-.116 1.316-.759 2.5-2.98 2.5s-2.864-1.184-2.98-2.5zm7.23-4.5c-.69 0-1.25.56-1.25 1.25v1.5a1.25 1.25 0 102.5 0v-1.5c0-.69-.56-1.25-1.25-1.25z"></path><path fill-rule="evenodd" d="M21.255 3.82a1.725 1.725 0 00-2.141-1.195c-.557.16-1.406.44-2.264.866-.78.386-1.647.93-2.293 1.677A18.442 18.442 0 0012 5c-.93 0-1.784.059-2.569.17-.645-.74-1.505-1.28-2.28-1.664a13.876 13.876 0 00-2.265-.866 1.725 1.725 0 00-2.141 1.196 23.645 23.645 0 00-.69 3.292c-.125.97-.191 2.07-.066 3.112C1.254 11.882 1 13.734 1 15.527 1 19.915 3.13 23 12 23c8.87 0 11-3.053 11-7.473 0-1.794-.255-3.647-.99-5.29.127-1.046.06-2.15-.066-3.125a23.652 23.652 0 00-.689-3.292zM20.5 14c.5 3.5-1.5 6.5-8.5 6.5s-9-3-8.5-6.5c.583-4 3-6 8.5-6s7.928 2 8.5 6z"></path></svg>
diff --git a/spec/lib/onebox/engine/github_folder_onebox_spec.rb b/spec/lib/onebox/engine/github_folder_onebox_spec.rb
index 6a9d0c18a3..3212b0dfae 100644
--- a/spec/lib/onebox/engine/github_folder_onebox_spec.rb
+++ b/spec/lib/onebox/engine/github_folder_onebox_spec.rb
@@ -16,7 +16,7 @@ describe Onebox::Engine::GithubFolderOnebox do
 
     describe "#to_html" do
       it "includes link to folder with truncated display path" do
-        expect(html).to include("<a href=\"https://github.com/discourse/discourse/tree/main/spec/fixtures\" target=\"_blank\" rel=\"noopener\">master/spec/fixtures</a>")
+        expect(html).to include('<a href="https://github.com/discourse/discourse/tree/main/spec/fixtures" target="_blank" rel="noopener">main/spec/fixtures</a>')
       end
 
       it "includes repository name" do

From 80950d7b28a621e57eb59caf042ec01408e79e37 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Mon, 19 Jul 2021 14:52:12 -0500
Subject: [PATCH 34/77] DEV: Add chat_mention notification type (#13784)

---
 app/models/notification.rb       |  5 +++--
 spec/models/notification_spec.rb | 10 ++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/models/notification.rb b/app/models/notification.rb
index b5a07a32e2..a22be0e901 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -75,7 +75,7 @@ class Notification < ActiveRecord::Base
     DB.exec(<<~SQL)
       DELETE
         FROM notifications n
-       WHERE high_priority
+       WHERE high_priority AND notification_type <> #{types[:chat_mention].to_i}
          AND NOT EXISTS (
             SELECT 1
               FROM posts p
@@ -116,7 +116,8 @@ class Notification < ActiveRecord::Base
                         reaction: 25,
                         votes_released: 26,
                         event_reminder: 27,
-                        event_invitation: 28
+                        event_invitation: 28,
+                        chat_mention: 29
                        )
   end
 
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index a97537a31a..e609a6063c 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -341,6 +341,16 @@ describe Notification do
 
       expect(Notification.count).to eq(2)
     end
+
+    it 'does not delete chat_message notifications' do
+      user = Fabricate(:user)
+      Notification.create!(read: false, user_id: user.id, topic_id: nil, post_number: nil, data: '[]',
+                           notification_type: Notification.types[:chat_mention])
+
+      expect {
+        Notification.ensure_consistency!
+      }.to_not change { Notification.count }
+    end
   end
 
   describe '.filter_by_consolidation_data' do

From fe5be427c353c1f7fb61d8a32c765dc8f77728af Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Mon, 19 Jul 2021 16:15:09 -0400
Subject: [PATCH 35/77] Update class name to avoid ad blocker (#13785)

---
 .../discourse/app/templates/components/share-popup.hbs        | 4 ++--
 .../discourse/app/templates/modal/create-invite.hbs           | 2 +-
 .../javascripts/discourse/app/templates/modal/share-topic.hbs | 4 ++--
 app/assets/stylesheets/common/base/share_link.scss            | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/templates/components/share-popup.hbs b/app/assets/javascripts/discourse/app/templates/components/share-popup.hbs
index 23e32ea420..5852650929 100644
--- a/app/assets/javascripts/discourse/app/templates/components/share-popup.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/share-popup.hbs
@@ -14,11 +14,11 @@
   }}
 </div>
 
-<div class="share-link-container">
+<div class="link-share-container">
   <input class="share-link-input" type="text" aria-label={{i18n "share.url"}}> {{copy-button selector="input.share-link-input"}}
 </div>
 
-<div class="share-link-actions">
+<div class="link-share-actions">
   <div class="sources">
     {{#each sources as |s|}}
       {{share-source source=s title=model.title action=(action "share")}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs b/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs
index cc5b126958..6754afe8d7 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs
@@ -2,7 +2,7 @@
   <form>
     <div class="input-group invite-link">
       <label for="invite-link">{{i18n "user.invited.invite.instructions"}}</label>
-      <div class="share-link-container">
+      <div class="link-share-container">
         {{input
           name="invite-link"
           class="invite-link"
diff --git a/app/assets/javascripts/discourse/app/templates/modal/share-topic.hbs b/app/assets/javascripts/discourse/app/templates/modal/share-topic.hbs
index 53cf997b9e..7aaf380c7a 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/share-topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/share-topic.hbs
@@ -2,7 +2,7 @@
   <form>
     <div class="input-group invite-link">
       <label for="invite-link">{{i18n "topic.share.instructions"}}</label>
-      <div class="share-link-container">
+      <div class="link-share-container">
         {{input
           name="invite-link"
           class="invite-link"
@@ -12,7 +12,7 @@
         {{copy-button selector="input.invite-link"}}
       </div>
     </div>
-    <div class="share-link-actions">
+    <div class="link-share-actions">
       <div class="sources">
         {{#each sources as |s|}}
           {{share-source source=s title=topic.title action=(action "share")}}
diff --git a/app/assets/stylesheets/common/base/share_link.scss b/app/assets/stylesheets/common/base/share_link.scss
index 4dcb731b64..69c6a2899f 100644
--- a/app/assets/stylesheets/common/base/share_link.scss
+++ b/app/assets/stylesheets/common/base/share_link.scss
@@ -1,6 +1,6 @@
 // styles that apply to the "share" modal & popup when sharing a link to a post or topic
 
-.share-link-container {
+.link-share-container {
   display: flex;
   button {
     transition-property: background-color, color; // don't transition outline
@@ -15,7 +15,7 @@
   }
 }
 
-.share-link-actions {
+.link-share-actions {
   display: flex;
   flex-wrap: wrap;
   align-items: center;

From e3144fc0c72a0ffd4bb6e5fb43e477ca541d2234 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Mon, 19 Jul 2021 19:01:09 -0400
Subject: [PATCH 36/77] FIX: Toggle search menu when click the same button
 (#13781)

---
 .../discourse/app/widgets/search-menu.js         |  2 +-
 .../discourse/tests/acceptance/search-test.js    | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/widgets/search-menu.js b/app/assets/javascripts/discourse/app/widgets/search-menu.js
index 6514e9a1d4..2ea06cdab6 100644
--- a/app/assets/javascripts/discourse/app/widgets/search-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/search-menu.js
@@ -286,7 +286,7 @@ export default createWidget("search-menu", {
     });
   },
 
-  mouseDownOutside() {
+  clickOutside() {
     this.sendWidgetAction("toggleSearchMenu");
   },
 
diff --git a/app/assets/javascripts/discourse/tests/acceptance/search-test.js b/app/assets/javascripts/discourse/tests/acceptance/search-test.js
index a61257e3c3..64224c8cee 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/search-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/search-test.js
@@ -52,6 +52,22 @@ acceptance("Search - Anonymous", function (needs) {
     );
   });
 
+  test("search button toggles search menu", async function (assert) {
+    await visit("/");
+
+    await click("#search-button");
+    assert.ok(exists(".search-menu"));
+
+    await click(".d-header"); // click outside
+    assert.ok(!exists(".search-menu"));
+
+    await click("#search-button");
+    assert.ok(exists(".search-menu"));
+
+    await click("#search-button"); // toggle same button
+    assert.ok(!exists(".search-menu"));
+  });
+
   test("search for a tag", async function (assert) {
     await visit("/");
 

From 0dadd61d27ea0c1ac1b479acdec4b4f1dbd6401c Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Tue, 20 Jul 2021 11:56:04 +1000
Subject: [PATCH 37/77] FIX: Change email from to not have via site_name for
 group SMTP (#13788)

We now use the group's full name in group SMTP emails, so we are dropping the via #{site_name}. If group owners still want this they can just change the full name of the group.
---
 app/mailers/group_smtp_mailer.rb           |  2 +-
 config/locales/server.en.yml               |  1 +
 spec/jobs/regular/group_smtp_email_spec.rb | 10 +++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/mailers/group_smtp_mailer.rb b/app/mailers/group_smtp_mailer.rb
index 9107101792..cc9d17f8a9 100644
--- a/app/mailers/group_smtp_mailer.rb
+++ b/app/mailers/group_smtp_mailer.rb
@@ -48,7 +48,7 @@ class GroupSmtpMailer < ActionMailer::Base
       locale: SiteSetting.default_locale,
       delivery_method_options: delivery_options,
       from: from_group.email_username,
-      from_alias: I18n.t('email_from', user_name: group_name, site_name: Email.site_title),
+      from_alias: I18n.t('email_from_without_site', user_name: group_name),
       html_override: html_override(post),
       cc: cc_addresses
     )
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 1978fe5241..3b57d2ae72 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -3458,6 +3458,7 @@ en:
   subject_re: "Re: "
   subject_pm: "[PM] "
   email_from: "%{user_name} via %{site_name}"
+  email_from_without_site: "%{user_name}"
 
   user_notifications:
     previous_discussion: "Previous Replies"
diff --git a/spec/jobs/regular/group_smtp_email_spec.rb b/spec/jobs/regular/group_smtp_email_spec.rb
index bc8991f097..59fc8d06c8 100644
--- a/spec/jobs/regular/group_smtp_email_spec.rb
+++ b/spec/jobs/regular/group_smtp_email_spec.rb
@@ -103,8 +103,8 @@ RSpec.describe Jobs::GroupSmtpEmail do
     email_log = EmailLog.find_by(post_id: post.id, topic_id: post.topic_id, user_id: recipient_user.id)
     post_reply_key = PostReplyKey.where(user_id: recipient_user, post_id: post.id).first
     expect(post_reply_key).to eq(nil)
-    expect(email_log.raw_headers).not_to include("Reply-To: Support Group via Discourse <#{group.email_username}")
-    expect(email_log.raw_headers).to include("From: Support Group via Discourse <#{group.email_username}")
+    expect(email_log.raw_headers).not_to include("Reply-To: Support Group <#{group.email_username}")
+    expect(email_log.raw_headers).to include("From: Support Group <#{group.email_username}")
   end
 
   it "creates an EmailLog record with the correct details" do
@@ -136,8 +136,8 @@ RSpec.describe Jobs::GroupSmtpEmail do
     email_log = EmailLog.find_by(post_id: post.id, topic_id: post.topic_id, user_id: recipient_user.id)
     post_reply_key = PostReplyKey.where(user_id: recipient_user, post_id: post.id).first
     expect(post_reply_key).to eq(nil)
-    expect(email_log.raw).not_to include("Reply-To: Support Group via Discourse <#{group.email_username}")
-    expect(email_log.raw).to include("From: Support Group via Discourse <#{group.email_username}")
+    expect(email_log.raw).not_to include("Reply-To: Support Group <#{group.email_username}")
+    expect(email_log.raw).to include("From: Support Group <#{group.email_username}")
   end
 
   it "falls back to the group name if full name is blank" do
@@ -146,7 +146,7 @@ RSpec.describe Jobs::GroupSmtpEmail do
     expect(ActionMailer::Base.deliveries.count).to eq(1)
     expect(ActionMailer::Base.deliveries.last.subject).to eq("Re: Help I need support")
     email_log = EmailLog.find_by(post_id: post.id, topic_id: post.topic_id, user_id: recipient_user.id)
-    expect(email_log.raw_headers).to include("From: support-group via Discourse <#{group.email_username}")
+    expect(email_log.raw_headers).to include("From: support-group <#{group.email_username}")
   end
 
   it "has the group_smtp_id and the to_address filled in correctly" do

From 784e92949972997aba9f09d4cc61414810324ccd Mon Sep 17 00:00:00 2001
From: Michael Brown <michael.brown@discourse.org>
Date: Mon, 19 Jul 2021 15:10:17 -0400
Subject: [PATCH 38/77] upload_creator: force ImageMagick to use internal SVG
 code to determine size

This change largely targets dev users, but it could potentially change
behaviour in production.

Jamie Wilson & I debugged a problem where "should not be larger than the
maximum thumbnail size" would fail due to timeouts.

On our systems, on ImageMagick 7.1.0-2, with inkscape installed, IM would
attempt to rasterise the svg then check the resulting filesize, causing the
test to timeout.

As of now, we haven't found a way to cause this to behave better, but have a
workaround in that forcing IM to use the internal renderer (`MSVG:`) seems to
make it perform the same on development workstations as it does in our docker
container.
---
 lib/upload_creator.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/upload_creator.rb b/lib/upload_creator.rb
index e5c43dc024..30b4ff99e6 100644
--- a/lib/upload_creator.rb
+++ b/lib/upload_creator.rb
@@ -127,10 +127,14 @@ class UploadCreator
         if @image_info.type.to_s == 'svg'
           w, h = [0, 0]
 
+          # identify can behave differently depending on how it's compiled and
+          # what programs (e.g. inkscape) are installed on your system.
+          # 'MSVG:' forces ImageMagick to use internal routines and behave
+          # consistently whether it's running from our docker container or not
           begin
             w, h = Discourse::Utils
-              .execute_command("identify", "-ping", "-format", "%w %h", @file.path, timeout: Upload::MAX_IDENTIFY_SECONDS)
-              .split(' ')
+              .execute_command("identify", "-ping", "-format", "%w %h", "MSVG:#{@file.path}", timeout: Upload::MAX_IDENTIFY_SECONDS)
+              .split(' ').map(&:to_i)
           rescue
             # use default 0, 0
           end

From b3352110381c0d2e2619f207c73ead93a36a3014 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 20 Jul 2021 01:06:05 -0400
Subject: [PATCH 39/77] FEATURE: Add input name so 1password ignores input
 (#13790)

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

diff --git a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-filter.hbs b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-filter.hbs
index 9927703f52..2882367dca 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-filter.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-filter.hbs
@@ -1,4 +1,5 @@
 {{#unless isHidden}}
+  {{!-- filter-input-search prevents 1password from attempting autocomplete --}}
   {{input
     tabindex=-1
     class="filter-input"
@@ -6,6 +7,7 @@
     autocomplete="discourse"
     autocorrect="off"
     autocapitalize="off"
+    name="filter-input-search"
     autofocus=selectKit.options.autofocus
     spellcheck=false
     value=(readonly selectKit.filter)

From 08c6a7679d8f74e5b63df167c179388bd9e3e43f Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <svkn.87@gmail.com>
Date: Tue, 20 Jul 2021 12:25:59 +0530
Subject: [PATCH 40/77] DEV: allow `dev:populate` rake task in production
 environment. (#13777)

To use this rake task in production `ALLOW_DEV_POPULATE` environment variable should be set to "1".
---
 Gemfile                                      | 8 ++++++++
 lib/discourse.rb                             | 4 ++++
 lib/discourse_dev/record.rb                  | 4 ++++
 lib/freedom_patches/translate_accelerator.rb | 2 +-
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 80d264469e..efd3fd5c34 100644
--- a/Gemfile
+++ b/Gemfile
@@ -175,8 +175,16 @@ group :development do
   gem 'better_errors', platform: :mri, require: !!ENV['BETTER_ERRORS']
   gem 'binding_of_caller'
   gem 'yaml-lint'
+end
+
+if ENV["ALLOW_DEV_POPULATE"] == "1"
   gem 'discourse_dev_assets'
   gem 'faker', "~> 2.16"
+else
+  group :development do
+    gem 'discourse_dev_assets'
+    gem 'faker', "~> 2.16"
+  end
 end
 
 # this is an optional gem, it provides a high performance replacement
diff --git a/lib/discourse.rb b/lib/discourse.rb
index dd6b65ee57..1d203658f0 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -1003,6 +1003,10 @@ module Discourse
     headers['Access-Control-Allow-Methods'] = CDN_REQUEST_METHODS.join(", ")
     headers
   end
+
+  def self.allow_dev_populate?
+    Rails.env.development? || ENV["ALLOW_DEV_POPULATE"] == "1"
+  end
 end
 
 # rubocop:enable Style/GlobalVars
diff --git a/lib/discourse_dev/record.rb b/lib/discourse_dev/record.rb
index b8b07d25ff..6a57189bf1 100644
--- a/lib/discourse_dev/record.rb
+++ b/lib/discourse_dev/record.rb
@@ -30,6 +30,10 @@ module DiscourseDev
     end
 
     def populate!(ignore_current_count: false)
+      unless Discourse.allow_dev_populate?
+        raise 'To run this rake task in a production site, set the value of `ALLOW_DEV_POPULATE` environment variable to "1"'
+      end
+
       unless ignore_current_count
         if current_count >= @count
           puts "Already have #{current_count} #{type} records"
diff --git a/lib/freedom_patches/translate_accelerator.rb b/lib/freedom_patches/translate_accelerator.rb
index 2bc4cac1e8..7bf8988d42 100644
--- a/lib/freedom_patches/translate_accelerator.rb
+++ b/lib/freedom_patches/translate_accelerator.rb
@@ -55,7 +55,7 @@ module I18n
         # load it
         I18n.backend.load_translations(I18n.load_path.grep(/\.#{Regexp.escape locale}\.yml$/))
 
-        if Rails.env.development?
+        if Discourse.allow_dev_populate?
           I18n.backend.load_translations(I18n.load_path.grep(/.*faker.*\/#{Regexp.escape locale}\.yml$/))
           I18n.backend.load_translations(I18n.load_path.grep(/.*faker.*\/#{Regexp.escape locale}\/.*\.yml$/))
         end

From 4cb65675c637d7f53609912f4367248971842397 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 20 Jul 2021 10:18:55 +0200
Subject: [PATCH 41/77] DEV: uses main branch in lefthooks (#13792)

---
 lefthook.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lefthook.yml b/lefthook.yml
index 50e4342d19..b5e3a77397 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -29,11 +29,11 @@ pre-commit:
 
 commands: &commands
   bundle-install:
-    files: git diff --name-only HEAD master
+    files: git diff --name-only HEAD main
     glob: "{Gemfile,Gemfile.lock,*.gemspec}"
     run: bundle install
   yarn-install:
-    files: git diff --name-only HEAD master
+    files: git diff --name-only HEAD main
     glob: "{package.json,yarn.lock}"
     run: yarn install
 

From 3d387d78916448f39bde04139fabd5dcda9d53be Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Tue, 20 Jul 2021 13:06:40 +0300
Subject: [PATCH 42/77] FIX: Serialize flair group ID for preferences page
 (#13741)

Staff viewing the user preferences page of other users did not see the
selected flair because that information was not serialized for them.
---
 app/serializers/user_card_serializer.rb           | 1 +
 spec/serializers/web_hook_user_serializer_spec.rb | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/serializers/user_card_serializer.rb b/app/serializers/user_card_serializer.rb
index 617db6a726..4ff67b9913 100644
--- a/app/serializers/user_card_serializer.rb
+++ b/app/serializers/user_card_serializer.rb
@@ -59,6 +59,7 @@ class UserCardSerializer < BasicUserSerializer
              :recent_time_read,
              :primary_group_id,
              :primary_group_name,
+             :flair_group_id,
              :flair_name,
              :flair_url,
              :flair_bg_color,
diff --git a/spec/serializers/web_hook_user_serializer_spec.rb b/spec/serializers/web_hook_user_serializer_spec.rb
index 68bc42fdc6..3b80fe8a22 100644
--- a/spec/serializers/web_hook_user_serializer_spec.rb
+++ b/spec/serializers/web_hook_user_serializer_spec.rb
@@ -42,6 +42,7 @@ RSpec.describe WebHookUserSerializer do
       :recent_time_read,
       :primary_group_id,
       :primary_group_name,
+      :flair_group_id,
       :flair_name,
       :flair_url,
       :flair_bg_color,

From 351ef6c2ccbd2c0d37557aa914cfeb2fb2514118 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 20 Jul 2021 12:26:52 +0200
Subject: [PATCH 43/77] UX: Tweak groups page css (#13775)

Improves icon-name alignment.
---
 .../stylesheets/common/base/groups.scss       | 51 ++++++++++---------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/app/assets/stylesheets/common/base/groups.scss b/app/assets/stylesheets/common/base/groups.scss
index d14ff4a51e..763ad34eed 100644
--- a/app/assets/stylesheets/common/base/groups.scss
+++ b/app/assets/stylesheets/common/base/groups.scss
@@ -14,8 +14,7 @@
 
   .groups-header-filters-name,
   .groups-header-filters-type {
-    margin-right: 5px;
-    margin-bottom: 0.5em;
+    margin: 0 0.5em 0.5em 0;
   }
 
   &:last-child {
@@ -28,65 +27,68 @@
 }
 
 .groups-boxes {
+  display: grid;
+  grid-gap: 1em;
+  grid-template-columns: repeat(4, 1fr);
   margin: 1em 0;
   width: 100%;
-  @supports (display: grid) {
-    display: grid;
-    grid-template-columns: repeat(4, 24%);
-    grid-column-gap: 1.333%;
-    grid-row-gap: 1em;
-    @include breakpoint("tablet") {
-      grid-template-columns: repeat(3, 32%);
-      grid-column-gap: 2%;
-    }
-    @include breakpoint("mobile-large") {
-      grid-template-columns: 100%;
-    }
+
+  @include breakpoint("medium") {
+    grid-template-columns: repeat(3, 1fr);
+  }
+
+  @include breakpoint("mobile-extra-large") {
+    grid-template-columns: repeat(2, 1fr);
   }
 
   .group-box {
-    @include breakpoint("mobile-large") {
-      margin: 0;
-    }
     display: flex;
     box-sizing: border-box;
     cursor: pointer;
     border: 1px solid var(--primary-low);
     color: var(--primary);
+
     .discourse-no-touch & {
       transition: all 0.25s;
+
       &:hover {
         box-shadow: shadow("card");
       }
     }
+
     .group-membership {
       color: var(--primary-medium);
       margin-top: auto;
       padding-top: 1em;
+
       .is-group-owner,
       .is-group-member {
         color: var(--success);
       }
     }
+
     .group-box-inner {
       padding: 1em;
       width: 100%;
       display: flex;
       flex-direction: column;
       box-sizing: border-box;
+      min-height: 8em;
+
       .group-info-wrapper {
+        align-items: center;
         display: flex;
-        overflow: hidden;
         flex: 0 1 auto;
+        margin-bottom: 0.25em;
+        min-height: 40px;
+        overflow: hidden;
+
         .group-avatar-flair {
-          margin-top: 0.2em;
-          margin-right: 8px;
-          flex: 0 0 auto;
+          margin-right: 0.5em;
         }
+
         .group-info {
-          flex: 1 0 auto;
-          margin-bottom: 1em;
-          width: 70%;
+          flex: 1 1 auto;
 
           span {
             width: 100%;
@@ -95,6 +97,7 @@
           }
         }
       }
+
       .group-user-count {
         display: flex;
         align-items: center;

From 1a8c949900993c229038916d6aeb0e319b470c41 Mon Sep 17 00:00:00 2001
From: Andrei Prigorshnev <a.prigorshnev@gmail.com>
Date: Tue, 20 Jul 2021 14:42:08 +0400
Subject: [PATCH 44/77] UX: suspend forever time period messages (#13776)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When the Forever option is selected for suspending a user, the user is suspended for 1000 years. Without customizing the site’s text, this time period is displayed to the user in the suspension email that is sent to the user, and if the user attempts to log back into the site. Telling someone that they have been suspended for 1000 years seems likely to come across as a bad attempt at humour.

This PR special case messages when a user suspended or silenced forever.
---
 app/controllers/session_controller.rb    |  7 +---
 app/mailers/user_notifications.rb        | 46 ++++++++++++++++--------
 app/models/user.rb                       | 25 +++++++++++++
 config/locales/server.en.yml             | 17 +++++++++
 lib/auth/result.rb                       |  3 +-
 spec/requests/session_controller_spec.rb | 22 +++++++++---
 6 files changed, 94 insertions(+), 26 deletions(-)

diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb
index ffd938165a..5857416195 100644
--- a/app/controllers/session_controller.rb
+++ b/app/controllers/session_controller.rb
@@ -589,13 +589,8 @@ class SessionController < ApplicationController
   end
 
   def failed_to_login(user)
-    message = user.suspend_reason ? "login.suspended_with_reason" : "login.suspended"
-
     {
-      error: I18n.t(message,
-        date: I18n.l(user.suspended_till, format: :date_only),
-        reason: Rack::Utils.escape_html(user.suspend_reason)
-      ),
+      error: user.suspended_message,
       reason: 'suspended'
     }
   end
diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index d5a20e0f07..87703304dd 100644
--- a/app/mailers/user_notifications.rb
+++ b/app/mailers/user_notifications.rb
@@ -153,13 +153,22 @@ class UserNotifications < ActionMailer::Base
 
     return unless user_history = opts[:user_history]
 
-    build_email(
-      user.email,
-      template: "user_notifications.account_silenced",
-      locale: user_locale(user),
-      reason: user_history.details,
-      silenced_till: I18n.l(user.silenced_till, format: :long)
-    )
+    if user.silenced_forever?
+      build_email(
+        user.email,
+        template: "user_notifications.account_silenced_forever",
+        locale: user_locale(user),
+        reason: user_history.details
+      )
+    else
+      build_email(
+        user.email,
+        template: "user_notifications.account_silenced",
+        locale: user_locale(user),
+        reason: user_history.details,
+        silenced_till: I18n.l(user.silenced_till, format: :long)
+      )
+    end
   end
 
   def account_suspended(user, opts = nil)
@@ -167,13 +176,22 @@ class UserNotifications < ActionMailer::Base
 
     return unless user_history = opts[:user_history]
 
-    build_email(
-      user.email,
-      template: "user_notifications.account_suspended",
-      locale: user_locale(user),
-      reason: user_history.details,
-      suspended_till: I18n.l(user.suspended_till, format: :long)
-    )
+    if user.suspended_forever?
+      build_email(
+        user.email,
+        template: "user_notifications.account_suspended_forever",
+        locale: user_locale(user),
+        reason: user_history.details
+      )
+    else
+      build_email(
+        user.email,
+        template: "user_notifications.account_suspended",
+        locale: user_locale(user),
+        reason: user_history.details,
+        suspended_till: I18n.l(user.suspended_till, format: :long)
+      )
+    end
   end
 
   def account_exists(user, opts = {})
diff --git a/app/models/user.rb b/app/models/user.rb
index da4dbeda2a..4f807458db 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -958,6 +958,10 @@ class User < ActiveRecord::Base
     silenced_record.try(:created_at) if silenced?
   end
 
+  def silenced_forever?
+    silenced_till > 100.years.from_now
+  end
+
   def suspend_record
     UserHistory.for(self, :suspend_user).order('id DESC').first
   end
@@ -974,6 +978,27 @@ class User < ActiveRecord::Base
     nil
   end
 
+  def suspended_message
+    return nil unless suspended?
+
+    message = "login.suspended"
+    if suspend_reason
+      if suspended_forever?
+        message = "login.suspended_with_reason_forever"
+      else
+        message = "login.suspended_with_reason"
+      end
+    end
+
+    I18n.t(message,
+           date: I18n.l(suspended_till, format: :date_only),
+           reason: Rack::Utils.escape_html(suspend_reason))
+  end
+
+  def suspended_forever?
+    suspended_till > 100.years.from_now
+  end
+
   # Use this helper to determine if the user has a particular trust level.
   # Takes into account admin, etc.
   def has_trust_level?(level)
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 3b57d2ae72..d92c007e50 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2515,6 +2515,7 @@ en:
     reset_not_allowed_from_ip_address: "You can't request a password reset from that IP address."
     suspended: "You can't log in until %{date}."
     suspended_with_reason: "Account suspended until %{date}: %{reason}"
+    suspended_with_reason_forever: "Account suspended: %{reason}"
     errors: "%{errors}"
     not_available: "Not available. Try %{suggestion}?"
     something_already_taken: "Something went wrong, perhaps the username or email is already registered. Try the forgot password link."
@@ -3703,6 +3704,14 @@ en:
 
         Reason - %{reason}
 
+    account_suspended_forever:
+      title: "Account Suspended"
+      subject_template: "[%{email_prefix}] Your account has been suspended"
+      text_body_template: |
+        You have been suspended from the forum.
+
+        Reason - %{reason}
+
     account_silenced:
       title: "Account Silenced"
       subject_template: "[%{email_prefix}] Your account has been silenced"
@@ -3711,6 +3720,14 @@ en:
 
         Reason - %{reason}
 
+    account_silenced_forever:
+      title: "Account Silenced"
+      subject_template: "[%{email_prefix}] Your account has been silenced"
+      text_body_template: |
+        You have been silenced from the forum.
+
+        Reason - %{reason}
+
     account_exists:
       title: "Account already exists"
       subject_template: "[%{email_prefix}] Account already exists"
diff --git a/lib/auth/result.rb b/lib/auth/result.rb
index 1b9c1d85b0..08a12203d2 100644
--- a/lib/auth/result.rb
+++ b/lib/auth/result.rb
@@ -111,8 +111,7 @@ class Auth::Result
     if user&.suspended?
       return {
         suspended: true,
-        suspended_message: I18n.t(user.suspend_reason ? "login.suspended_with_reason" : "login.suspended",
-                                   date: I18n.l(user.suspended_till, format: :date_only), reason: user.suspend_reason)
+        suspended_message: user.suspended_message
       }
     end
 
diff --git a/spec/requests/session_controller_spec.rb b/spec/requests/session_controller_spec.rb
index 6bf7b0e05a..74fce7879a 100644
--- a/spec/requests/session_controller_spec.rb
+++ b/spec/requests/session_controller_spec.rb
@@ -1401,11 +1401,25 @@ RSpec.describe SessionController do
             login: user.username, password: 'myawesomepassword'
           }
 
+          expected_message = I18n.t('login.suspended_with_reason',
+                                    date: I18n.l(user.suspended_till, format: :date_only),
+                                    reason: Rack::Utils.escape_html(user.suspend_reason))
           expect(response.status).to eq(200)
-          expect(response.parsed_body['error']).to eq(I18n.t('login.suspended_with_reason',
-            date: I18n.l(user.suspended_till, format: :date_only),
-            reason: Rack::Utils.escape_html(user.suspend_reason)
-          ))
+          expect(response.parsed_body['error']).to eq(expected_message)
+        end
+
+        it 'when suspended forever should return an error without suspended till date' do
+          user.suspended_till = 101.years.from_now
+          user.suspended_at = Time.now
+          user.save!
+          StaffActionLogger.new(user).log_user_suspend(user, "<strike>banned</strike>")
+
+          post "/session.json", params: {
+            login: user.username, password: 'myawesomepassword'
+          }
+
+          expected_message = I18n.t('login.suspended_with_reason_forever', reason: Rack::Utils.escape_html(user.suspend_reason))
+          expect(response.parsed_body['error']).to eq(expected_message)
         end
       end
 

From efc8d5f13471af6cc70eaebc2663df57dcd6c954 Mon Sep 17 00:00:00 2001
From: Andrei Prigorshnev <a.prigorshnev@gmail.com>
Date: Tue, 20 Jul 2021 15:49:20 +0400
Subject: [PATCH 45/77] DEV: ignore the 2FA table when moving timestamps
 (#13793)

or 2FA will be broken after moving. We use this script for moving timestamps when restoring Try.
---
 script/db_timestamps_mover.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/db_timestamps_mover.rb b/script/db_timestamps_mover.rb
index 44eac5ad9a..530370e7b6 100644
--- a/script/db_timestamps_mover.rb
+++ b/script/db_timestamps_mover.rb
@@ -79,7 +79,7 @@ def is_date?(string)
 end
 
 def create_updater
-  ignore_tables = %w[application_requests user_visits]
+  ignore_tables = %w[application_requests user_second_factors user_visits]
   TimestampsUpdater.new "public", ignore_tables
 end
 

From af5cf5ec2a7d352fe7c39ae7385016762d2bda96 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Tue, 20 Jul 2021 09:58:54 -0500
Subject: [PATCH 46/77] FIX: User directory - correct variable names (#13798)

---
 .../javascripts/discourse/app/components/directory-table.js     | 2 +-
 app/assets/javascripts/discourse/app/templates/mobile/users.hbs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/directory-table.js b/app/assets/javascripts/discourse/app/components/directory-table.js
index e92b8846e1..08cb163562 100644
--- a/app/assets/javascripts/discourse/app/components/directory-table.js
+++ b/app/assets/javascripts/discourse/app/components/directory-table.js
@@ -79,7 +79,7 @@ export default Component.extend({
     }
   },
 
-  willDestoryElement() {
+  willDestroyElement() {
     this._tableContainer.removeEventListener("scroll", this.onBottomScroll);
     this._topHorizontalScrollBar.removeEventListener(
       "scroll",
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/users.hbs b/app/assets/javascripts/discourse/app/templates/mobile/users.hbs
index ff80213deb..632c911875 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/users.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/users.hbs
@@ -35,7 +35,7 @@
         {{/if}}
       </div>
 
-      {{#conditional-loading-spinner condition=model.loading}}
+      {{#conditional-loading-spinner condition=isLoading}}
         {{#if model.length}}
           <div class="total-rows">{{i18n "directory.total_rows" count=model.totalRows}}</div>
           {{#each model as |item|}}

From 5f6b9e36edd80cea5901c42f9ebdfee5d12f534a Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 20 Jul 2021 13:58:38 -0400
Subject: [PATCH 47/77] UX: New text and style for dominating topic message
 (#13789)

---
 .../templates/composer/dominating-topic.hbs   | 11 +++++++++++
 .../stylesheets/common/base/compose.scss      |  2 +-
 app/assets/stylesheets/common/base/modal.scss |  4 +++-
 .../components/share-and-invite-modal.scss    |  5 -----
 app/assets/stylesheets/desktop/compose.scss   | 19 ++++++++++++++++---
 config/locales/server.en.yml                  |  7 +------
 lib/composer_messages_finder.rb               |  4 ++--
 lib/svg_sprite/svg_sprite.rb                  |  1 +
 8 files changed, 35 insertions(+), 18 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/app/templates/composer/dominating-topic.hbs

diff --git a/app/assets/javascripts/discourse/app/templates/composer/dominating-topic.hbs b/app/assets/javascripts/discourse/app/templates/composer/dominating-topic.hbs
new file mode 100644
index 0000000000..63be2ba0b0
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/templates/composer/dominating-topic.hbs
@@ -0,0 +1,11 @@
+<a href {{action closeMessage message}} class="close">{{d-icon "times"}}</a>
+{{html-safe message.body}}
+
+{{#if currentUser.can_invite_to_forum}}
+  {{d-button
+    class="btn-primary"
+    label="topic.invite_reply.title"
+    icon="user-friends"
+    action=(route-action "showInvite")
+  }}
+{{/if}}
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index 31ddf209d8..4ff99259e3 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -322,7 +322,7 @@
     display: flex;
     align-items: center;
     margin-right: auto;
-    button {
+    .btn-primary {
       flex: 0 0 auto;
     }
     .cancel {
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index 75ed4bf18d..51a27ce4eb 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -631,7 +631,9 @@
           &.single-tab {
             background: none;
             color: var(--primary);
-            padding: 4px 0;
+            padding: 0;
+            font-size: var(--font-up-3);
+            font-weight: bold;
           }
         }
       }
diff --git a/app/assets/stylesheets/common/components/share-and-invite-modal.scss b/app/assets/stylesheets/common/components/share-and-invite-modal.scss
index ff164eedb9..9aaedeec6b 100644
--- a/app/assets/stylesheets/common/components/share-and-invite-modal.scss
+++ b/app/assets/stylesheets/common/components/share-and-invite-modal.scss
@@ -2,11 +2,6 @@
   .modal-body {
     max-width: 475px;
     min-width: 320px;
-    padding: 0;
-  }
-
-  .modal-panel {
-    padding: 0.667em;
   }
 
   .modal-header {
diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss
index 8b4970ddc3..7e0be8be02 100644
--- a/app/assets/stylesheets/desktop/compose.scss
+++ b/app/assets/stylesheets/desktop/compose.scss
@@ -85,16 +85,17 @@
 }
 
 .composer-popup {
+  box-sizing: border-box;
   position: absolute;
-  width: calc(50% - 45px);
+  width: calc(50% - 30px);
   max-width: 724px;
-  top: 20px;
+  top: 21px; // grippie height + .reply-to margin-top + .reply-area padding-top
   bottom: 10px;
   left: 51%;
   overflow-y: auto;
   z-index: z("composer", "popover");
   padding: 10px 10px 35px 10px;
-  box-shadow: shadow("card");
+  box-shadow: shadow("dropdown");
   background: var(--highlight-medium);
   .hide-preview & {
     z-index: z("composer", "dropdown") + 1;
@@ -108,6 +109,18 @@
     background-color: var(--tertiary-low);
   }
 
+  &.dominating-topic-message {
+    bottom: unset;
+    padding: 2.25em 6em 2.5em 2.25em;
+    p {
+      margin-top: 0;
+      font-size: var(--font-up-1);
+    }
+    button {
+      margin-top: 0.5em;
+    }
+  }
+
   h3 {
     margin-bottom: 10px;
   }
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index d92c007e50..b00d9832e8 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -523,12 +523,7 @@ en:
 
       It’s easier for everyone to read topics that have fewer in-depth replies versus lots of small, individual replies.
 
-    dominating_topic: |
-      ### Let others join the conversation
-
-      This topic is clearly important to you &ndash; you've posted more than %{percent}% of the replies here.
-
-      It could be even better if you gave other people space to share their points of view, too. Can you invite them over?
+    dominating_topic: You’ve posted more than %{percent}% of the replies here, is there anyone else you would like to hear from?
 
     get_a_room: |
       ### Encourage everyone to get involved in the conversation
diff --git a/lib/composer_messages_finder.rb b/lib/composer_messages_finder.rb
index 27bddef4e1..fcacecb6d8 100644
--- a/lib/composer_messages_finder.rb
+++ b/lib/composer_messages_finder.rb
@@ -141,9 +141,9 @@ class ComposerMessagesFinder
 
     {
       id: 'dominating_topic',
-      templateName: 'education',
+      templateName: 'dominating-topic',
       wait_for_typing: true,
-      extraClass: 'education-message',
+      extraClass: 'education-message dominating-topic-message',
       body: PrettyText.cook(I18n.t('education.dominating_topic', percent: (ratio * 100).round))
     }
   end
diff --git a/lib/svg_sprite/svg_sprite.rb b/lib/svg_sprite/svg_sprite.rb
index e65fa4f2e7..fdc7e70e94 100644
--- a/lib/svg_sprite/svg_sprite.rb
+++ b/lib/svg_sprite/svg_sprite.rb
@@ -207,6 +207,7 @@ module SvgSprite
     "upload",
     "user",
     "user-edit",
+    "user-friends",
     "user-plus",
     "user-secret",
     "user-shield",

From 4223541bc5ddd901657962f1ff2e2ac1d5b83c8f Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Tue, 20 Jul 2021 20:25:48 +0200
Subject: [PATCH 48/77] DEV: Fix release_note task warnings (#13794)

There was a bunch of warnings repeated over and over during spec runs:

```
/var/www/discourse/lib/tasks/release_note.rake:3: warning: already initialized constant DATE_REGEX
/var/www/discourse/lib/tasks/release_note.rake:3: warning: previous definition of DATE_REGEX was here
/var/www/discourse/lib/tasks/release_note.rake:5: warning: already initialized constant CHANGE_TYPES
/var/www/discourse/lib/tasks/release_note.rake:5: warning: previous definition of CHANGE_TYPES was here
```
---
 lib/tasks/release_note.rake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/tasks/release_note.rake b/lib/tasks/release_note.rake
index 12d68c1e7f..01bc01b35b 100644
--- a/lib/tasks/release_note.rake
+++ b/lib/tasks/release_note.rake
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-DATE_REGEX = /\A\d{4}-\d{2}-\d{2}/
+DATE_REGEX ||= /\A\d{4}-\d{2}-\d{2}/
 
-CHANGE_TYPES = [
+CHANGE_TYPES ||= [
   { pattern: /^FEATURE:/, heading: "New Features" },
   { pattern: /^FIX:/, heading: "Bug Fixes" },
   { pattern: /^UX:/, heading: "UX Changes" },

From 0d8144b62b7b685f4be1d7faf4abcc22605618ef Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 21 Jul 2021 12:18:34 +0800
Subject: [PATCH 49/77] DEV: Improve logging of errors in
 `Jobs::ProcessUserNotificationSchedules`

Gives us the actual error and backtrace to work with. Otherwise, the
logging of the error is not useful at all.
---
 app/jobs/scheduled/process_user_notification_schedules.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/jobs/scheduled/process_user_notification_schedules.rb b/app/jobs/scheduled/process_user_notification_schedules.rb
index a82db6e2d5..1e793e01f0 100644
--- a/app/jobs/scheduled/process_user_notification_schedules.rb
+++ b/app/jobs/scheduled/process_user_notification_schedules.rb
@@ -8,8 +8,8 @@ module Jobs
       UserNotificationSchedule.enabled.includes(:user).each do |schedule|
         begin
           schedule.create_do_not_disturb_timings
-        rescue
-          Rails.logger.warn("Failed to process user_notification_schedule with ID #{schedule.id}")
+        rescue => e
+          Discourse.warn_exception(e, message: "Failed to process user_notification_schedule with ID #{schedule.id}")
         end
       end
     end

From 0ea58fe51fe7bdfdc573d01e393592b73ffb49b8 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <gerhard.schlager@discourse.org>
Date: Tue, 20 Jul 2021 16:03:20 +0200
Subject: [PATCH 50/77] DEV: Spec shouldn't depend on translation

---
 spec/services/push_notification_pusher_spec.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spec/services/push_notification_pusher_spec.rb b/spec/services/push_notification_pusher_spec.rb
index 62ae1cfc93..851675cf34 100644
--- a/spec/services/push_notification_pusher_spec.rb
+++ b/spec/services/push_notification_pusher_spec.rb
@@ -47,8 +47,10 @@ RSpec.describe PushNotificationPusher do
       SiteSetting.allow_user_locale = true
       user.update!(locale: 'pt_BR')
 
+      TranslationOverride.upsert!("pt_BR", "discourse_push_notifications.popup.mentioned", "pt_BR notification")
+
       Webpush.expects(:payload_send).with do |*args|
-        args.to_s.include?("system mencionou")
+        JSON.parse(args.first[:message])["title"] == "pt_BR notification"
       end.once
 
       create_subscription

From 7162ecfb04cca5f8778b7cf9cdbbe524c3132b43 Mon Sep 17 00:00:00 2001
From: mintsaxon <svc.mintsaxon@mailnull.com>
Date: Sun, 27 Jun 2021 21:46:11 +0200
Subject: [PATCH 51/77] FEATURE: Per-category default slow mode duration for
 topics.

When configured, all topics in the category inherits the slow mode
duration from the category's default.

Note that currently there is no way to remove the slow mode from the
topics once it has been set.
---
 .../app/components/edit-category-settings.js      |  6 ++++++
 .../javascripts/discourse/app/models/category.js  |  6 ++++++
 .../components/edit-category-settings.hbs         | 15 +++++++++++++++
 .../stylesheets/common/base/edit-category.scss    |  3 ++-
 app/controllers/categories_controller.rb          |  1 +
 app/models/category.rb                            |  1 +
 app/models/topic.rb                               |  7 +++++++
 app/serializers/category_serializer.rb            |  3 ++-
 config/locales/client.en.yml                      |  1 +
 ..._add_default_auto_close_seconds_to_category.rb |  7 +++++++
 .../schemas/json/category_create_response.json    |  7 +++++++
 .../schemas/json/category_update_response.json    |  7 +++++++
 12 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20210702204007_add_default_auto_close_seconds_to_category.rb

diff --git a/app/assets/javascripts/discourse/app/components/edit-category-settings.js b/app/assets/javascripts/discourse/app/components/edit-category-settings.js
index bfcfa19cd5..93947368f3 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-settings.js
+++ b/app/assets/javascripts/discourse/app/components/edit-category-settings.js
@@ -138,4 +138,10 @@ export default buildCategoryPanel("settings", {
     let hours = minutes ? minutes / 60 : null;
     this.set("category.auto_close_hours", hours);
   },
+
+  @action
+  onDefaultSlowModeDurationChange(minutes) {
+    let seconds = minutes ? minutes * 60 : null;
+    this.set("category.default_slow_mode_seconds", seconds);
+  },
 });
diff --git a/app/assets/javascripts/discourse/app/models/category.js b/app/assets/javascripts/discourse/app/models/category.js
index af65076dba..940bb5ba39 100644
--- a/app/assets/javascripts/discourse/app/models/category.js
+++ b/app/assets/javascripts/discourse/app/models/category.js
@@ -177,6 +177,11 @@ const Category = RestModel.extend({
     return topicCount;
   },
 
+  @discourseComputed("default_slow_mode_seconds")
+  defaultSlowModeMinutes(seconds) {
+    return seconds ? seconds / 60 : null;
+  },
+
   save() {
     const id = this.id;
     const url = id ? `/categories/${id}` : "/categories";
@@ -193,6 +198,7 @@ const Category = RestModel.extend({
         auto_close_based_on_last_post: this.get(
           "auto_close_based_on_last_post"
         ),
+        default_slow_mode_seconds: this.default_slow_mode_seconds,
         position: this.position,
         email_in: this.email_in,
         email_in_allow_strangers: this.email_in_allow_strangers,
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs
index 78c3414a36..8dc72c5702 100644
--- a/app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs
@@ -116,6 +116,21 @@
     </label>
   </section>
 
+  <section class="field default-slow-mode">
+    <div class="control-group">
+      <label for="category-default-slow-mode">
+        {{i18n "category.default_slow_mode"}}
+      </label>
+      <div class="category-default-slow-mode-seconds">
+        {{relative-time-picker
+            id="category-default-slow-mode"
+            durationMinutes=category.defaultSlowModeMinutes
+            hiddenIntervals=hiddenRelativeIntervals
+            onChange=(action "onDefaultSlowModeDurationChange")}}
+      </div>
+    </div>
+  </section>
+
   <section class="field auto-close">
     <div class="control-group">
       <label for="topic-auto-close">
diff --git a/app/assets/stylesheets/common/base/edit-category.scss b/app/assets/stylesheets/common/base/edit-category.scss
index f454f49b80..0fcbd51823 100644
--- a/app/assets/stylesheets/common/base/edit-category.scss
+++ b/app/assets/stylesheets/common/base/edit-category.scss
@@ -158,7 +158,8 @@ div.edit-category {
     padding: 0 1.5em 2em 0;
   }
 
-  .category-topic-auto-close-hours {
+  .category-topic-auto-close-hours,
+  .category-default-slow-mode-seconds {
     width: 200px;
   }
 }
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index b60b1a2956..c22d6be7e3 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -302,6 +302,7 @@ class CategoriesController < ApplicationController
         :mailinglist_mirror,
         :all_topics_wiki,
         :allow_unlimited_owner_edits_on_first_post,
+        :default_slow_mode_seconds,
         :parent_category_id,
         :auto_close_hours,
         :auto_close_based_on_last_post,
diff --git a/app/models/category.rb b/app/models/category.rb
index 73e8f6ee8f..d36d490ace 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -1027,6 +1027,7 @@ end
 #  read_only_banner                          :string
 #  default_list_filter                       :string(20)       default("all")
 #  allow_unlimited_owner_edits_on_first_post :boolean          default(FALSE), not null
+#  default_slow_mode_seconds                 :integer
 #
 # Indexes
 #
diff --git a/app/models/topic.rb b/app/models/topic.rb
index 5150a28952..a618b56923 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -334,6 +334,7 @@ class Topic < ActiveRecord::Base
 
     if category_id_changed? || new_record?
       inherit_auto_close_from_category
+      inherit_slow_mode_from_category
     end
   end
 
@@ -1251,6 +1252,12 @@ class Topic < ActiveRecord::Base
     end
   end
 
+  def inherit_slow_mode_from_category
+    if self.category&.default_slow_mode_seconds
+      self.slow_mode_seconds = self.category&.default_slow_mode_seconds
+    end
+  end
+
   def inherit_auto_close_from_category(timer_type: :close)
     auto_close_hours = self.category&.auto_close_hours
 
diff --git a/app/serializers/category_serializer.rb b/app/serializers/category_serializer.rb
index fe42e1172a..0efe3f5b5b 100644
--- a/app/serializers/category_serializer.rb
+++ b/app/serializers/category_serializer.rb
@@ -20,7 +20,8 @@ class CategorySerializer < SiteCategorySerializer
              :custom_fields,
              :topic_featured_link_allowed,
              :search_priority,
-             :reviewable_by_group_name
+             :reviewable_by_group_name,
+             :default_slow_mode_seconds
 
   def reviewable_by_group_name
     object.reviewable_by_group.name
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 0a5974c9fe..02265ea3ce 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3217,6 +3217,7 @@ en:
       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: "Minimum number of tags required in a topic:"
+      default_slow_mode: 'Enable "Slow Mode" for new topics in this category.'
       parent: "Parent Category"
       num_auto_bump_daily: "Number of open topics to automatically bump daily:"
       navigate_to_first_post_after_read: "Navigate to first post after topics are read"
diff --git a/db/migrate/20210702204007_add_default_auto_close_seconds_to_category.rb b/db/migrate/20210702204007_add_default_auto_close_seconds_to_category.rb
new file mode 100644
index 0000000000..dca44c36b2
--- /dev/null
+++ b/db/migrate/20210702204007_add_default_auto_close_seconds_to_category.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddDefaultAutoCloseSecondsToCategory < ActiveRecord::Migration[6.1]
+  def change
+    add_column :categories, :default_slow_mode_seconds, :integer
+  end
+end
diff --git a/spec/requests/api/schemas/json/category_create_response.json b/spec/requests/api/schemas/json/category_create_response.json
index 87aca679ff..53823807dd 100644
--- a/spec/requests/api/schemas/json/category_create_response.json
+++ b/spec/requests/api/schemas/json/category_create_response.json
@@ -170,6 +170,12 @@
         "allow_unlimited_owner_edits_on_first_post": {
           "type": "boolean"
         },
+        "default_slow_mode_seconds": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
         "group_permissions": {
           "type": "array",
           "items": [
@@ -274,6 +280,7 @@
         "auto_close_hours",
         "auto_close_based_on_last_post",
         "allow_unlimited_owner_edits_on_first_post",
+        "default_slow_mode_seconds",
         "group_permissions",
         "email_in",
         "email_in_allow_strangers",
diff --git a/spec/requests/api/schemas/json/category_update_response.json b/spec/requests/api/schemas/json/category_update_response.json
index 94a8d50708..f15c082677 100644
--- a/spec/requests/api/schemas/json/category_update_response.json
+++ b/spec/requests/api/schemas/json/category_update_response.json
@@ -173,6 +173,12 @@
         "allow_unlimited_owner_edits_on_first_post": {
           "type": "boolean"
         },
+        "default_slow_mode_seconds": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
         "group_permissions": {
           "type": "array",
           "items": [
@@ -277,6 +283,7 @@
         "auto_close_hours",
         "auto_close_based_on_last_post",
         "allow_unlimited_owner_edits_on_first_post",
+        "default_slow_mode_seconds",
         "group_permissions",
         "email_in",
         "email_in_allow_strangers",

From 40f6ceb6f2256540806733e16facdbf239a402be Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Wed, 21 Jul 2021 17:03:04 +1000
Subject: [PATCH 52/77] FIX: display warning when SSO email is different from
 invite email (#13804)

In this commit, we skipped frontend validation when email is obfuscated:
https://github.com/discourse/discourse/commit/534008ba24c

However, if email from SSO is different from email from invite, we should still display warning.
---
 .../discourse/app/controllers/invites-show.js |  9 +++--
 .../tests/acceptance/invite-accept-test.js    | 36 ++++++++++++++++++-
 app/controllers/invites_controller.rb         |  7 ++++
 3 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/invites-show.js b/app/assets/javascripts/discourse/app/controllers/invites-show.js
index 278b6c0109..0a6574e9ff 100644
--- a/app/assets/javascripts/discourse/app/controllers/invites-show.js
+++ b/app/assets/javascripts/discourse/app/controllers/invites-show.js
@@ -31,6 +31,7 @@ export default Controller.extend(
     accountEmail: alias("email"),
     hiddenEmail: alias("model.hidden_email"),
     emailVerifiedByLink: alias("model.email_verified_by_link"),
+    differentExternalEmail: alias("model.different_external_email"),
     accountUsername: alias("model.username"),
     passwordRequired: notEmpty("accountPassword"),
     successMessage: null,
@@ -130,7 +131,8 @@ export default Controller.extend(
       "authOptions.email",
       "authOptions.email_valid",
       "hiddenEmail",
-      "emailVerifiedByLink"
+      "emailVerifiedByLink",
+      "differentExternalEmail"
     )
     emailValidation(
       email,
@@ -138,9 +140,10 @@ export default Controller.extend(
       externalAuthEmail,
       externalAuthEmailValid,
       hiddenEmail,
-      emailVerifiedByLink
+      emailVerifiedByLink,
+      differentExternalEmail
     ) {
-      if (hiddenEmail) {
+      if (hiddenEmail && !differentExternalEmail) {
         return EmberObject.create({
           ok: true,
           reason: I18n.t("user.email.ok"),
diff --git a/app/assets/javascripts/discourse/tests/acceptance/invite-accept-test.js b/app/assets/javascripts/discourse/tests/acceptance/invite-accept-test.js
index ea41e3b504..0aecb13f9a 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/invite-accept-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/invite-accept-test.js
@@ -1,6 +1,7 @@
 import {
   acceptance,
   exists,
+  query,
   queryAll,
 } from "discourse/tests/helpers/qunit-helpers";
 import { fillIn, visit } from "@ember/test-helpers";
@@ -22,7 +23,12 @@ function setAuthenticationData(hooks, json) {
   });
 }
 
-function preloadInvite({ link = false, email_verified_by_link = false } = {}) {
+function preloadInvite({
+  link = false,
+  email_verified_by_link = false,
+  different_external_email = false,
+  hidden_email = false,
+} = {}) {
   const info = {
     invited_by: {
       id: 123,
@@ -33,6 +39,8 @@ function preloadInvite({ link = false, email_verified_by_link = false } = {}) {
     },
     username: "invited",
     email_verified_by_link: email_verified_by_link,
+    different_external_email: different_external_email,
+    hidden_email: hidden_email,
   };
 
   if (link) {
@@ -362,6 +370,32 @@ acceptance(
   }
 );
 
+acceptance(
+  "Email Invite link with different external email address",
+  function (needs) {
+    needs.settings({ enable_local_logins: false });
+
+    setAuthenticationData(needs.hooks, {
+      auth_provider: "facebook",
+      email: "foobar+different@example.com",
+      email_valid: true,
+      username: "foobar",
+      name: "barfoo",
+    });
+
+    test("display information that email is invalid", async function (assert) {
+      preloadInvite({ different_external_email: true, hidden_email: true });
+
+      await visit("/invites/myvalidinvitetoken");
+
+      assert.equal(
+        query(".bad").textContent.trim(),
+        "Your invitation email does not match the email authenticated by Facebook"
+      );
+    });
+  }
+);
+
 acceptance(
   "Email Invite link with valid authentication data, valid email token, unverified authentication email",
   function (needs) {
diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index f883e4c4d5..270aed283f 100644
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -50,10 +50,13 @@ class InvitesController < ApplicationController
       email = Email.obfuscate(invite.email)
 
       # Show email if the user already authenticated their email
+      different_external_email = false
       if session[:authentication]
         auth_result = Auth::Result.from_session_data(session[:authentication], user: nil)
         if invite.email == auth_result.email
           email = invite.email
+        else
+          different_external_email = true
         end
       end
 
@@ -73,6 +76,10 @@ class InvitesController < ApplicationController
         email_verified_by_link: email_verified_by_link
       }
 
+      if different_external_email
+        info[:different_external_email] = true
+      end
+
       if staged_user = User.where(staged: true).with_email(invite.email).first
         info[:username] = staged_user.username
         info[:user_fields] = staged_user.user_fields

From 28b5e6e47d1967d3fc4310613f4963b3f304d305 Mon Sep 17 00:00:00 2001
From: Discourse Translator Bot <discourse.translator.bot@gmail.com>
Date: Wed, 21 Jul 2021 04:30:34 -0400
Subject: [PATCH 53/77] Update translations (#13796)

---
 config/locales/client.ar.yml                  |  302 +-
 config/locales/client.be.yml                  |   10 +-
 config/locales/client.bg.yml                  |   39 +-
 config/locales/client.bs_BA.yml               |   13 +-
 config/locales/client.ca.yml                  |   15 +-
 config/locales/client.cs.yml                  |   13 +-
 config/locales/client.da.yml                  |   29 +-
 config/locales/client.de.yml                  |   27 +-
 config/locales/client.el.yml                  |   24 +-
 config/locales/client.es.yml                  |   24 +-
 config/locales/client.et.yml                  |   20 +-
 config/locales/client.fa_IR.yml               |   13 +-
 config/locales/client.fi.yml                  |   20 -
 config/locales/client.fr.yml                  |   22 +-
 config/locales/client.gl.yml                  |   24 +-
 config/locales/client.he.yml                  |   34 +-
 config/locales/client.hu.yml                  |   21 +-
 config/locales/client.hy.yml                  |   23 +-
 config/locales/client.id.yml                  |    9 +-
 config/locales/client.it.yml                  |   91 +-
 config/locales/client.ja.yml                  |  155 +-
 config/locales/client.ko.yml                  |   25 +-
 config/locales/client.lt.yml                  |   12 +-
 config/locales/client.lv.yml                  |   11 +-
 config/locales/client.nb_NO.yml               |   13 +-
 config/locales/client.nl.yml                  |   24 +-
 config/locales/client.pl_PL.yml               |   69 +-
 config/locales/client.pt.yml                  |   22 +-
 config/locales/client.pt_BR.yml               |  552 ++-
 config/locales/client.ro.yml                  |   13 +-
 config/locales/client.ru.yml                  |   34 +-
 config/locales/client.sk.yml                  |   12 +-
 config/locales/client.sl.yml                  |   20 +-
 config/locales/client.sq.yml                  |   11 +-
 config/locales/client.sr.yml                  |   11 +-
 config/locales/client.sv.yml                  |   41 +-
 config/locales/client.sw.yml                  |   13 +-
 config/locales/client.te.yml                  |   10 +-
 config/locales/client.th.yml                  |   14 +-
 config/locales/client.tr_TR.yml               |   35 +-
 config/locales/client.uk.yml                  |   24 +-
 config/locales/client.ur.yml                  |   15 +-
 config/locales/client.vi.yml                  |   24 +-
 config/locales/client.zh_CN.yml               |  515 +--
 config/locales/client.zh_TW.yml               |   13 +-
 config/locales/server.ar.yml                  |  123 +-
 config/locales/server.be.yml                  |    6 +-
 config/locales/server.bg.yml                  |    7 +-
 config/locales/server.bs_BA.yml               |    1 -
 config/locales/server.ca.yml                  |    7 +-
 config/locales/server.cs.yml                  |    1 -
 config/locales/server.da.yml                  |    6 +-
 config/locales/server.de.yml                  |   28 +-
 config/locales/server.el.yml                  |    7 +-
 config/locales/server.es.yml                  |   33 -
 config/locales/server.et.yml                  |    1 -
 config/locales/server.fa_IR.yml               |    4 +-
 config/locales/server.fi.yml                  |   33 -
 config/locales/server.fr.yml                  |   33 -
 config/locales/server.gl.yml                  |   38 +-
 config/locales/server.he.yml                  |   55 +-
 config/locales/server.hu.yml                  |    2 -
 config/locales/server.hy.yml                  |    7 +-
 config/locales/server.it.yml                  |  190 +-
 config/locales/server.ja.yml                  | 2076 ++++++++++-
 config/locales/server.ko.yml                  |   26 +-
 config/locales/server.nb_NO.yml               |    4 +-
 config/locales/server.nl.yml                  |   34 +-
 config/locales/server.pl_PL.yml               |  166 +-
 config/locales/server.pt.yml                  |    1 -
 config/locales/server.pt_BR.yml               | 1451 ++++++--
 config/locales/server.ro.yml                  |    1 -
 config/locales/server.ru.yml                  |   30 +-
 config/locales/server.sk.yml                  |    1 -
 config/locales/server.sl.yml                  |    6 +
 config/locales/server.sq.yml                  |    1 -
 config/locales/server.sv.yml                  |   63 +-
 config/locales/server.sw.yml                  |    7 +-
 config/locales/server.te.yml                  |    1 -
 config/locales/server.tr_TR.yml               |  225 +-
 config/locales/server.uk.yml                  |    7 +-
 config/locales/server.ur.yml                  |    7 +-
 config/locales/server.vi.yml                  |   28 -
 config/locales/server.zh_CN.yml               | 3272 +++++++++--------
 config/locales/server.zh_TW.yml               |    7 +-
 .../config/locales/client.pt_BR.yml           |    2 +-
 .../config/locales/server.bg.yml              |    4 +
 .../config/locales/server.it.yml              |    2 +
 .../config/locales/server.ja.yml              |    2 +-
 .../config/locales/server.zh_CN.yml           |    4 +-
 .../config/locales/client.ar.yml              |    2 +-
 .../config/locales/client.pt_BR.yml           |   25 +-
 .../config/locales/client.zh_CN.yml           |   14 +-
 .../config/locales/server.ja.yml              |    2 +-
 .../config/locales/server.pt_BR.yml           |    6 +-
 .../config/locales/server.zh_CN.yml           |    8 +-
 .../config/locales/client.pt_BR.yml           |    4 +-
 .../config/locales/client.zh_CN.yml           |    4 +-
 .../config/locales/server.ar.yml              |    4 +-
 .../config/locales/server.it.yml              |   12 +-
 .../config/locales/server.ja.yml              |   24 +-
 .../config/locales/server.pl_PL.yml           |    6 +
 .../config/locales/server.pt_BR.yml           |  257 +-
 .../config/locales/server.zh_CN.yml           |  332 +-
 .../config/locales/server.bg.yml              |    3 +
 .../config/locales/server.pt_BR.yml           |    4 +-
 .../config/locales/server.zh_CN.yml           |    4 +-
 plugins/poll/config/locales/client.ar.yml     |    2 +-
 plugins/poll/config/locales/client.it.yml     |    9 +
 plugins/poll/config/locales/client.ja.yml     |    2 +-
 plugins/poll/config/locales/client.pt_BR.yml  |   81 +-
 plugins/poll/config/locales/client.zh_CN.yml  |   76 +-
 plugins/poll/config/locales/server.ar.yml     |    2 +-
 plugins/poll/config/locales/server.pt_BR.yml  |    8 +-
 plugins/poll/config/locales/server.zh_CN.yml  |   60 +-
 .../config/locales/client.pt_BR.yml           |   51 +
 .../config/locales/client.zh_CN.yml           |   42 +-
 .../styleguide/config/locales/server.ar.yml   |    2 +-
 .../styleguide/config/locales/server.bg.yml   |    3 +
 .../styleguide/config/locales/server.da.yml   |    2 +-
 .../styleguide/config/locales/server.de.yml   |    2 +-
 .../styleguide/config/locales/server.es.yml   |    2 +-
 .../styleguide/config/locales/server.fi.yml   |    2 +-
 .../styleguide/config/locales/server.fr.yml   |    2 +-
 .../styleguide/config/locales/server.gl.yml   |    2 +-
 .../styleguide/config/locales/server.he.yml   |    2 +-
 .../styleguide/config/locales/server.hu.yml   |    2 +-
 .../styleguide/config/locales/server.it.yml   |    2 +-
 .../styleguide/config/locales/server.ja.yml   |    2 +-
 .../styleguide/config/locales/server.ko.yml   |    2 +-
 .../styleguide/config/locales/server.nl.yml   |    2 +-
 .../config/locales/server.pl_PL.yml           |    2 +-
 .../styleguide/config/locales/server.pt.yml   |    2 +-
 .../config/locales/server.pt_BR.yml           |    3 +
 .../styleguide/config/locales/server.ro.yml   |    2 +-
 .../styleguide/config/locales/server.ru.yml   |    2 +-
 .../styleguide/config/locales/server.sv.yml   |    2 +-
 .../config/locales/server.tr_TR.yml           |    2 +-
 .../styleguide/config/locales/server.uk.yml   |    2 +-
 .../styleguide/config/locales/server.ur.yml   |    2 +-
 .../styleguide/config/locales/server.vi.yml   |    2 +-
 .../config/locales/server.zh_CN.yml           |    4 +-
 public/403.zh_CN.html                         |    6 +-
 public/422.pt_BR.html                         |    2 +-
 public/422.zh_CN.html                         |    6 +-
 public/500.bg.html                            |   10 +-
 public/500.pt_BR.html                         |    8 +-
 public/500.zh_CN.html                         |    8 +-
 public/503.bg.html                            |    2 +-
 public/503.pt_BR.html                         |    2 +-
 public/503.zh_CN.html                         |    8 +-
 151 files changed, 7693 insertions(+), 3928 deletions(-)

diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index 53bf38bc54..9952d5601b 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -213,7 +213,7 @@ ar:
       url: "نسخ عنوان URL ومشاركته"
     action_codes:
       public_topic: "جعل هذا الموضوع عامًا في %{when}"
-      private_topic: "حوَّل هذا الموضوع إلى رسالة شخصية في %{when}"
+      private_topic: "حوَّل هذا الموضوع إلى رسالة خاصة في %{when}"
       split_topic: "قسَّم هذا الموضوع في %{when}"
       invited_user: "دعا %{who} في ‏%{when}"
       invited_group: "دعا %{who} في ‏%{when}"
@@ -234,7 +234,7 @@ ar:
         enabled: "تم تثبيته في %{when}"
         disabled: "تم إلغاء تثبيته في %{when}"
       pinned_globally:
-        enabled: "تم تثبيته عموميًا في %{when}"
+        enabled: "تم تثبيته بشكلٍ عام في %{when}"
         disabled: "تم إلغاء تثبيته في %{when}"
       visible:
         enabled: "تم الإدراج في %{when}"
@@ -245,7 +245,7 @@ ar:
       forwarded: "أعاد توجيه الرسالة الإلكترونية أعلاه"
     topic_admin_menu: "إجراءات الموضوع"
     wizard_required: "مرحبًا بك في Discourse! لنبدأ من <a href='%{url}' data-auto-route='true'>معالج الإعداد</a> ✨"
-    emails_are_disabled: "عطَّل أحد المسؤولين البريد الصادر بشكلٍ عمومي. ولن يتم إرسال إشعارات عبر البريد الإلكتروني أيًا كان نوعها."
+    emails_are_disabled: "أوقف أحد المسؤولين البريد الصادر بشكلٍ عام. ولن يتم إرسال إشعارات عبر البريد الإلكتروني أيًا كان نوعها."
     software_update_prompt:
       dismiss: "تجاهل"
     bootstrap_mode_enabled:
@@ -255,10 +255,10 @@ ar:
       few: "أنت في وضع تمهيد التشغيل لتسهيل إطلاق موقعك الجديد. سيتم منح جميع المستخدمين الجُدد مستوى الثقة 1 وتفعيل الرسائل الإلكترونية التلخيصية لهم. وسيتم إيقاف هذا الوضع تلقائيًا عند انضمام %{count} مستخدمين."
       many: "أنت في وضع تمهيد التشغيل لتسهيل إطلاق موقعك الجديد. سيتم منح جميع المستخدمين الجُدد مستوى الثقة 1 وتفعيل الرسائل الإلكترونية التلخيصية لهم. وسيتم إيقاف هذا الوضع تلقائيًا عند انضمام %{count} مستخدمًا."
       other: "أنت في وضع تمهيد التشغيل لتسهيل إطلاق موقعك الجديد. سيتم منح جميع المستخدمين الجُدد مستوى الثقة 1 وتفعيل الرسائل الإلكترونية التلخيصية لهم. وسيتم إيقاف هذا الوضع تلقائيًا عند انضمام %{count} مستخدم."
-    bootstrap_mode_disabled: "سيتم تعطيل وضع تمهيد التشغيل خلال 24 ساعة."
+    bootstrap_mode_disabled: "سيتم إيقاف وضع تمهيد التشغيل خلال 24 ساعة."
     themes:
       default_description: "افتراضية"
-      broken_theme_alert: "قد لا يعمل موقعك الإلكتروني كما ينبغي بسبب وجود أخطاء في السمة/المكوِّن %{theme}. ويمكنك تعطيله من المسار %{path}."
+      broken_theme_alert: "قد لا يعمل الموقع كما ينبغي بسبب وجود أخطاء في السمة/المكوِّن %{theme}. أوقفه من %{path}."
     s3:
       regions:
         ap_northeast_1: "آسيا والمحيط الهادئ (طوكيو)"
@@ -313,7 +313,6 @@ ar:
     conduct: "قواعد السلوك"
     mobile_view: "العرض على الجوَّال"
     desktop_view: "العرض على كمبيوتر سطح المكتب"
-    you: "أنت"
     or: "أو"
     now: "منذ لحظات"
     read_more: "قراءة المزيد"
@@ -370,7 +369,7 @@ ar:
       confirm_delete: "هل تريد بالتأكيد حذف هذه الإشارة المرجعية؟ سيتم حذف التذكير أيضًا."
       confirm_clear: "هل تريد بالتأكيد مسح كل إشاراتك المرجعية من هذا الموضوع؟"
       save: "حفظ"
-      no_timezone: 'لم تحدد منطقتك الزمنية بعد. ولن تتمكن من ضبط التذكيرات. حدد منطقة زمنية <a href="%{basePath}/my/preferences/profile">في ملفك الشخصي</a>.'
+      no_timezone: 'لم تحدد منطقتك الزمنية بعد. ولن تتمكن من ضبط التذكيرات. حدِّد منطقة زمنية <a href="%{basePath}/my/preferences/profile">في ملفك الشخصي</a>.'
       invalid_custom_datetime: "التاريخ والوقت الذين أدخلتهما غير صالحين، يُرجى إعادة المحاولة."
       list_permission_denied: "ليس لديك إذن بعرض الإشارات المرجعية لهذا المستخدم."
       no_user_bookmarks: "ليس لديك منشورات موضوع عليها إشارة مرجعية. تتيح لك الإشارات المرجعية الرجوع إلى المنشورات التي تريدها بسرعة."
@@ -393,7 +392,6 @@ ar:
       remove: "إزالة"
       remove_confirmation: "هل تريد بالتأكيد حذف هذه المسودة؟"
       new_topic: "مسودة موضوع جديد"
-      new_private_message: "مسودة رسالة خاصة جديدة"
       topic_reply: "مسودة الرد"
     topic_count_latest:
       zero: "عرض %{count} موضوع جديد أو محدَّث"
@@ -429,7 +427,7 @@ ar:
     uploaded: "تم التحميل!"
     pasting: "جارٍ اللصق..."
     enable: "تفعيل"
-    disable: "تعطيل"
+    disable: "إيقاف"
     continue: "متابعة"
     undo: "تراجَع"
     revert: "عودة"
@@ -464,7 +462,7 @@ ar:
         score_to_hide: "النقاط اللازمة لإخفاء المنشور"
         take_action_bonus:
           name: "اتخذ إجراءً"
-          title: "عندما يقرر أحد أعضاء الطاقم اتخاذ إجراء، يتم منح مكافأة على البلاغ."
+          title: "عندما يقرر أحد أعضاء الفريق اتخاذ إجراء، يتم منح مكافأة على البلاغ."
         user_accuracy_bonus:
           name: "دقة المستخدم"
           title: "يحصل المستخدمون الذين تم التحقُّق من صحة بلاغاتهم بشكلٍ متكرر على مكافأة."
@@ -473,7 +471,7 @@ ar:
           title: "تحظى العناصر القابلة للمراجعة التي أنشأها مستخدمون من مستوى ثقة أعلى بنقاط أعلى."
         type_bonus:
           name: "مكافأة النوع"
-          title: "يمكن لطاقم العمل تخصيص مكافأة لبعض الأنواع القابلة للمراجعة لمنحها أولوية أعلى."
+          title: "يمكن لفريق العمل تخصيص مكافأة لبعض الأنواع القابلة للمراجعة لمنحها أولوية أعلى."
       claim_help:
         optional: "يمكنك المطالبة بهذا العنصر لمنع الآخرين من مراجعته."
         required: "يجب عليك المطالبة بالعناصر قبل أن تتمكن من مراجعتها."
@@ -695,7 +693,7 @@ ar:
         other: "%{count} مستخدم"
       edit_columns:
         save: "حفظ"
-        reset_to_default: "إعادة التعيين إلى الافتراضي"
+        reset_to_default: "إعادة الضبط على الافتراضي"
       group:
         all: "كل المجموعات"
     group_histories:
@@ -800,7 +798,7 @@ ar:
       message: "رسالة"
       confirm_leave: "هل تريد بالتأكيد مغادرة هذه المجموعة؟"
       allow_membership_requests: "السماح للمستخدمين بإرسال طلبات العضوية إلى مالكي المجموعة (يلزم أن تكون المجموعة عامة)"
-      membership_request_template: "قالب مخصَّص يتم عرضه للمستخدمين عند إرسال طلب عضوية"
+      membership_request_template: "نموذج مخصَّص يتم عرضه للمستخدمين عند إرسال طلب عضوية"
       membership_request:
         submit: "إرسال طلب"
         title: "طلب الانضمام إلى @%{group_name}"
@@ -825,8 +823,6 @@ ar:
         public: "عامة"
         private: "خاصة"
         public_groups: "المجموعات العامة"
-        automatic_group: مجموعة تلقائية
-        close_group: مجموعة مغلقة
         my_groups: "مجموعاتي"
         group_type: "نوع المجموعة"
         is_group_user: "عضو"
@@ -890,7 +886,7 @@ ar:
       flair_preview_icon: "معاينة الأيقونة"
       flair_preview_image: "معاينة الصورة"
       flair_type:
-        icon: "اختيار أيقونة"
+        icon: "تحديد أيقونة"
         image: "تحميل صورة"
     user_action_groups:
       "1": "الإعجابات"
@@ -921,7 +917,6 @@ ar:
       posts: "المشاركات"
       topics: "الموضوعات"
       latest: "الحديثة"
-      toggle_ordering: "تفعيل التحكم في الترتيب"
       subcategories: "الفئات الفرعية"
       muted: "الفئات المكتومة"
       topic_sentence:
@@ -967,7 +962,7 @@ ar:
       powered_by: "باستخدام <a href='https://maxmind.com'>MaxMindDB</a>"
       copied: "تم النسخ"
     user_fields:
-      none: "(حدِّد خيارًا)"
+      none: "(تحديد خيار)"
       required: 'يُرجى إدخال قيمة لـ "%{name}"'
     user:
       said: "%{username}:"
@@ -1010,8 +1005,8 @@ ar:
       read: "المقروءة"
       preferences: "التفضيلات"
       feature_topic_on_profile:
-        open_search: "اختيار موضوع جديد"
-        title: "اختيار موضوع"
+        open_search: "تحديد موضوع جديد"
+        title: "تحديد موضوع"
         search_label: "البحث عن موضوع بالعنوان"
         save: "حفظ"
         clear:
@@ -1034,9 +1029,9 @@ ar:
         perm_default: "تفعيل الإشعارات"
         perm_denied_btn: "‏‏تم رفض الإذن"
         perm_denied_expl: "لقد رفضت منح الإذن بإرسال الإشعارات. يمكنك السماح بالإشعارات في إعدادات المتصفح."
-        disable: "تعطيل الإشعارات"
+        disable: "إيقاف الإشعارات"
         enable: "تفعيل الإشعارات"
-        each_browser_note: 'ملاحظة: عليك تغيير هذا الإعداد في كل متصفح تستخدمه. سيتم تعطيل جميع الإشعارات في وضع "عدم الإزعاج"، بغض النظر عن هذا الإعداد.'
+        each_browser_note: 'ملاحظة: عليك تغيير هذا الإعداد في كل متصفح تستخدمه. سيتم إيقاف جميع الإشعارات في وضع "عدم الإزعاج"، بغض النظر عن هذا الإعداد.'
         consent_prompt: "هل تريد تلقي إشعارات فورية عند رد الأشخاص على منشوراتك؟"
       dismiss: "تجاهل"
       dismiss_notifications: "تجاهل الكل"
@@ -1053,14 +1048,14 @@ ar:
       color_schemes:
         disable_dark_scheme: "مثل العادي"
         dark_instructions: "يمكنك معاينة نظام ألوان الوضع الداكن عن طريق تفعيل الوضع الداكن لجهازك."
-        undo: "إعادة التعيين"
+        undo: "إعادة الضبط"
         regular: "العادي"
         dark: "الوضع الداكن"
         default_dark_scheme: "(الوضع الافتراضي للموقع)"
       dark_mode: "الوضع الداكن"
       dark_mode_enable: "تفعيل نظام الألوان في الوضع الداكن تلقائيًا"
       text_size_default_on_all_devices: "جعل هذا الحجم الافتراضي للنص على جميع أجهزتي"
-      allow_private_messages: "السماح للمستخدمين الآخرين بإرسال رسائل شخصية إليَّ"
+      allow_private_messages: "السماح للمستخدمين الآخرين بإرسال رسائل خاصة إليَّ"
       external_links_in_new_tab: "فتح كل الروابط الخارجية في علامة تبويب جديدة"
       enable_quoting: "تفعيل الرد باقتباس للنص المميز"
       enable_defer: "تفعيل التأجيل لوضع علامة على الموضوعات كغير مقروءة"
@@ -1107,21 +1102,21 @@ ar:
       muted_categories_instructions_dont_hide: "لن تتلقى أي إشعارات أبدًا بخصوص الموضوعات الجديدة في هذه الفئات."
       regular_categories: "العادية"
       regular_categories_instructions: "سترى هذه الفئات في قوائم الموضوعات \"الحديثة\" و\"الأكثر عرضًا\"."
-      no_category_access: "كمشرف لديك صلاحيات وصول محدودة للفئات، فالحفظ معطَّل."
+      no_category_access: "كمشرف لديك صلاحيات وصول محدودة للفئات، فالحفظ متوقف."
       delete_account: "حذف حسابي"
       delete_account_confirm: "هل تريد بالتأكيد حذف حسابك للأبد؟ لا يمكن التراجع عن هذا الإجراء!"
       deleted_yourself: "تم حذف حسابك بنجاح."
-      delete_yourself_not_allowed: "يُرجى التواصل مع أحد أعضاء الطاقم إذا أردت حذف حسابك."
+      delete_yourself_not_allowed: "يُرجى التواصل مع أحد أعضاء الفريق إذا أردت حذف حسابك."
       unread_message_count: "الرسائل"
       admin_delete: "حذف"
       users: "المستخدمون"
       muted_users: "المكتومون"
-      muted_users_instructions: "منع جميع الإشعارات والرسائل الشخصية من هؤلاء المستخدمين"
+      muted_users_instructions: "منع جميع الإشعارات والرسائل الخاصة من هؤلاء المستخدمين"
       allowed_pm_users: "السماح"
-      allowed_pm_users_instructions: "السماح بالرسائل الشخصية من هؤلاء المستخدمين فقط"
-      allow_private_messages_from_specific_users: "السماح لمستخدمين محدَّدين فقط بإرسال الرسائل الشخصية إليَّ"
+      allowed_pm_users_instructions: "السماح بالرسائل الخاصة من هؤلاء المستخدمين فقط"
+      allow_private_messages_from_specific_users: "السماح لمستخدمين محدَّدين فقط بإرسال الرسائل الخاصة إليَّ"
       ignored_users: "التجاهل"
-      ignored_users_instructions: "منع جميع المشاركات والإشعارات والرسائل الشخصية من هؤلاء المستخدمين"
+      ignored_users_instructions: "منع جميع المشاركات والإشعارات والرسائل الخاصة من هؤلاء المستخدمين"
       tracked_topics_link: "إظهار"
       automatically_unpin_topics: "إلغاء تثبيت الموضوعات تلقائيًا عند وصولي إلى نهايتها."
       apps: "التطبيقات"
@@ -1148,7 +1143,7 @@ ar:
         groups: "مجموعاتي"
         move_to_inbox: "نقل إلى صندوق الوارد"
         move_to_archive: "أرشفة"
-        failed_to_move: "فشل نقل الرسائل المحدَّدة (قد تكون شبكتك معطَّلة)"
+        failed_to_move: "فشل نقل الرسائل المحدَّدة (قد تكون شبكتك متوقفة)"
         tags: "الوسوم"
       preferences_nav:
         account: "الحساب"
@@ -1166,14 +1161,14 @@ ar:
         in_progress: "(جارٍ إرسال رسالة البريد الإلكتروني)"
         error: "(خطأ)"
         emoji: "قفل الرمز التعبيري"
-        action: "إرسال رسالة إلكترونية لإعادة تعيين كلمة المرور"
+        action: "إرسال رسالة إلكترونية لإعادة ضبط كلمة المرور"
         set_password: "ضبط كلمة المرور"
         choose_new: "اختيار كلمة مرور جديدة"
         choose: "اختيار كلمة مرور"
       second_factor_backup:
         title: "الرموز الاحياطية للمصادقة الثنائية"
         regenerate: "أعِد التوليد"
-        disable: "تعطيل"
+        disable: "إيقاف"
         enable: "تفعيل"
         enable_long: "تفعيل الرموز الاحتياطية"
         manage:
@@ -1202,7 +1197,7 @@ ar:
       second_factor:
         title: "المصادقة الثنائية"
         enable: "إدارة المصادقة الثنائية"
-        disable_all: "تعطيل الكل"
+        disable_all: "إيقاف الكل"
         forgot_password: "هل نسيت كلمة المرور؟"
         confirm_password_description: "يُرجى تأكيد كلمة المرور للمتابعة"
         name: "الاسم"
@@ -1216,11 +1211,11 @@ ar:
           احمِ حسابك برموز أمان تُستخدَم لمرة واحدة.
         extended_description: |
           تضيف المصادقة الثنائية أمانًا إضافيًا إلى حسابك من خلال طلب رمز مميز لمرة واحدة بالإضافة إلى كلمة مرورك. يمكن إنشاء الرموز المميزة على الأجهزة التي تعمل بنظام التشغيل <a href="https://www.google.com/search?q=authenticator+apps+for+android" target='_blank'>Android</a> و<a href="https://www.google.com/search?q=authenticator+apps+for+ios">iOS</a>.
-        oauth_enabled_warning: "يُرجى العلم بأنه سيتم تعطيل تسجيل الدخول بحسابات التواصل الاجتماعي بعد تفعيل المصادقة الثنائية على حسابك."
+        oauth_enabled_warning: "يُرجى العلم بأنه سيتم إيقاف تسجيل الدخول بحسابات التواصل الاجتماعي بعد تفعيل المصادقة الثنائية على حسابك."
         use: "استخدام تطبيق المصادقة"
         enforced_notice: "يلزم تفعيل المصادقة الثنائية قبل الوصول إلى هذا الموقع."
-        disable: "تعطيل"
-        disable_confirm: "هل تريد بالتأكيد تعطيل جميع وسائل المصادقة الثنائية؟"
+        disable: "إيقاف"
+        disable_confirm: "هل تريد بالتأكيد إيقاف جميع وسائل المصادقة الثنائية؟"
         save: "حفظ"
         edit: "تعديل"
         edit_title: "تعديل تطبيق المصادقة"
@@ -1296,7 +1291,7 @@ ar:
         add_email: "إضافة بريد إلكتروني بديل"
         no_secondary: "لا توجد عناوين بريد إلكتروني ثانوية"
         instructions: "لا يظهر للعامة أبدًا."
-        admin_note: "ملاحظة: يشير تغيير المستخدم المسؤول لعنوان البريد الإلكتروني لمستخدم آخر غير مسؤول إلى أن المستخدم قد فقد الوصول إلى حساب البريد الإلكتروني الأصلي؛ لذلك ستتم مراسلته عبر البريد الإلكتروني لإعادة تعيين كلمة المرور إلى عنوانه الجديد. ولن يتغير عنوان البريد الإلكتروني للمستخدم حتى يكمل عملية إعادة تعيين كلمة المرور."
+        admin_note: "ملاحظة: يشير تغيير المستخدم المسؤول لعنوان البريد الإلكتروني لمستخدم آخر غير مسؤول إلى أن المستخدم قد فقد الوصول إلى حساب البريد الإلكتروني الأصلي؛ لذلك ستتم مراسلته عبر البريد الإلكتروني لإعادة ضبط كلمة المرور إلى عنوانه الجديد. ولن يتغير عنوان البريد الإلكتروني للمستخدم حتى يكمل عملية إعادة ضبط كلمة المرور."
         ok: "سنُرسل إليك رسالة إلكترونية للتأكيد"
         required: "يُرجى إدخال عنوان بريد إلكتروني"
         invalid: "يُرجى إدخال عنوان بريد إلكتروني صالح"
@@ -1364,7 +1359,6 @@ ar:
         browser_active: '‏%{browser} | <span class="active">نشط الآن</span>'
         browser_last_seen: "‏%{browser} |‏ %{date}"
       last_posted: "آخر مشاركة"
-      last_emailed: "آخر رسالة عبر البريد الإلكتروني"
       last_seen: "آخر ظهور"
       created: "تاريخ الانضمام"
       log_out: "تسجيل الخروج"
@@ -1624,15 +1618,15 @@ ar:
     refresh: "تحديث"
     home: "الصفحة الرئيسية"
     read_only_mode:
-      enabled: "هذا الموقع في وضع القراءة فقط. نأمل أن تواصل تصفُّحه، لكن الرد وتسجيل الإعجاب وغيرهما من الإجراءات ستكون معطَّلة حاليًا."
-      login_disabled: "يكون تسجيل الدخول معطلًا في حال كان الموقع في وضع القراءة فقط."
-      logout_disabled: "يتم تعطيل تسجيل الخروج عندما يكون الموقع في وضع القراءة فقط."
+      enabled: "هذا الموقع في وضع القراءة فقط. نأمل أن تواصل تصفُّحه، لكن الرد وتسجيل الإعجاب وغيرهما من الإجراءات ستكون متوقفة حاليًا."
+      login_disabled: "يكون تسجيل الدخول متوقفًا في حال كان الموقع في وضع القراءة فقط."
+      logout_disabled: "يتم إيقاف تسجيل الخروج عندما يكون الموقع في وضع القراءة فقط."
     too_few_topics_and_posts_notice_MF: >-
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">لنبدأ المناقشة!</a> هناك {currentTopics, plural, zero {<strong>#</strong> موضوع} one {موضوع واحد (<strong>#</strong>)} two {موضوعان (<strong>#</strong>)} few {<strong>#</strong> موضوعات} many {<strong>#</strong> موضوعًا} other {<strong>#</strong> موضوع}} و{currentPosts, plural, zero {<strong>#</strong> منشور} one {منشور واحد (<strong>#</strong>)} two {منشوران (<strong>#</strong>)} few {<strong>#</strong> منشورات} many {<strong>#</strong> منشورًا} other {<strong>#</strong> منشور}}. يحتاج الزوار إلى المزيد ليقرؤوه ويردوا عليه. إننا نقترح {requiredTopics, plural, zero {<strong>#</strong> موضوع} one {موضوع واحد (<strong>#</strong>)} two {موضوعان (<strong>#</strong>)} few {<strong>#</strong> موضوعات} many {<strong>#</strong> موضوعًا} other {<strong>#</strong> موضوع}} و{requiredPosts, plural, zero {<strong>#</strong> منشور} one {منشور واحد (<strong>#</strong>)} two {منشوران (<strong>#</strong>)} few {<strong>#</strong> منشورات} many {<strong>#</strong> منشورًا} other {<strong>#</strong> منشور}} على الأقل. يمكن لطاقم العمل فقط رؤية هذه الرسالة.
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">لنبدأ المناقشة!</a> هناك {currentTopics, plural, zero {<strong>#</strong> موضوع} one {موضوع واحد (<strong>#</strong>)} two {موضوعان (<strong>#</strong>)} few {<strong>#</strong> موضوعات} many {<strong>#</strong> موضوعًا} other {<strong>#</strong> موضوع}} و{currentPosts, plural, zero {<strong>#</strong> منشور} one {منشور واحد (<strong>#</strong>)} two {منشوران (<strong>#</strong>)} few {<strong>#</strong> منشورات} many {<strong>#</strong> منشورًا} other {<strong>#</strong> منشور}}. يحتاج الزوار إلى المزيد ليقرؤوه ويردوا عليه. إننا نقترح {requiredTopics, plural, zero {<strong>#</strong> موضوع} one {موضوع واحد (<strong>#</strong>)} two {موضوعان (<strong>#</strong>)} few {<strong>#</strong> موضوعات} many {<strong>#</strong> موضوعًا} other {<strong>#</strong> موضوع}} و{requiredPosts, plural, zero {<strong>#</strong> منشور} one {منشور واحد (<strong>#</strong>)} two {منشوران (<strong>#</strong>)} few {<strong>#</strong> منشورات} many {<strong>#</strong> منشورًا} other {<strong>#</strong> منشور}} على الأقل. يمكن لفريق العمل فقط رؤية هذه الرسالة.
     too_few_topics_notice_MF: >-
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">لنبدأ المناقشة!</a> هناك {currentTopics, plural, zero {<strong>#</strong> موضوع} one {موضوع واحد (<strong>#</strong>)} two {موضوعان (<strong>#</strong>)} few {<strong>#</strong> موضوعات} many {<strong>#</strong> موضوعًا} other {<strong>#</strong> موضوع}}. يحتاج الزوار إلى المزيد ليقرؤوه ويردوا عليه. إننا نقترح {requiredTopics, plural, zero {<strong>#</strong> موضوع} one {موضوع واحد (<strong>#</strong>)} two {موضوعان (<strong>#</strong>)} few {<strong>#</strong> موضوعات} many {<strong>#</strong> موضوعًا} other {<strong>#</strong> موضوع}} على الأقل. يمكن لطاقم العمل فقط رؤية هذه الرسالة.
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">لنبدأ المناقشة!</a> هناك {currentTopics, plural, zero {<strong>#</strong> موضوع} one {موضوع واحد (<strong>#</strong>)} two {موضوعان (<strong>#</strong>)} few {<strong>#</strong> موضوعات} many {<strong>#</strong> موضوعًا} other {<strong>#</strong> موضوع}}. يحتاج الزوار إلى المزيد ليقرؤوه ويردوا عليه. إننا نقترح {requiredTopics, plural, zero {<strong>#</strong> موضوع} one {موضوع واحد (<strong>#</strong>)} two {موضوعان (<strong>#</strong>)} few {<strong>#</strong> موضوعات} many {<strong>#</strong> موضوعًا} other {<strong>#</strong> موضوع}} على الأقل. يمكن لفريق العمل فقط رؤية هذه الرسالة.
     too_few_posts_notice_MF: >-
-      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">لنبدأ المناقشة!</a> هناك {currentPosts, plural, zero {<strong>#</strong> منشور} one {منشور واحد (<strong>#</strong>)} two {منشوران (<strong>#</strong>)} few {<strong>#</strong> منشورات} many {<strong>#</strong> منشورًا} other {<strong>#</strong> منشور}}. يحتاج الزوار إلى المزيد ليقرؤوه ويردوا عليه. إننا نقترح {requiredPosts, plural, zero {<strong>#</strong> منشور} one {منشور واحد (<strong>#</strong>)} two {منشوران (<strong>#</strong>)} few {<strong>#</strong> منشورات} many {<strong>#</strong> منشورًا} other {<strong>#</strong> منشور}} على الأقل. يمكن لطاقم العمل فقط رؤية هذه الرسالة.
+      <a href="https://blog.discourse.org/2014/08/building-a-discourse-community/">لنبدأ المناقشة!</a> هناك {currentPosts, plural, zero {<strong>#</strong> منشور} one {منشور واحد (<strong>#</strong>)} two {منشوران (<strong>#</strong>)} few {<strong>#</strong> منشورات} many {<strong>#</strong> منشورًا} other {<strong>#</strong> منشور}}. يحتاج الزوار إلى المزيد ليقرؤوه ويردوا عليه. إننا نقترح {requiredPosts, plural, zero {<strong>#</strong> منشور} one {منشور واحد (<strong>#</strong>)} two {منشوران (<strong>#</strong>)} few {<strong>#</strong> منشورات} many {<strong>#</strong> منشورًا} other {<strong>#</strong> منشور}} على الأقل. يمكن لفريق العمل فقط رؤية هذه الرسالة.
     logs_error_rate_notice:
       reached_hour_MF: "<b>{relativeAge}</b> – لقد بلغ معدل الخطأ <a href='{url}' target='_blank'>{rate, plural, zero {<strong>#</strong> خطأ/الساعة} one {خطأ واحد (#)/الساعة} two {خطآن (#)/الساعة} few {# أخطاء/الساعة} many {# خطأ/الساعة} other {# خطأ/الساعة}}</a> حد إعدادات الموقع البالغ {limit, plural, zero {<strong>#</strong> خطأ/الساعة} one {خطأ واحد (#)/الساعة} two {خطآن (#)/الساعة} few {# أخطاء/الساعة} many {# خطأ/الساعة} other {# خطأ/الساعة}}."
       reached_minute_MF: "<b>{relativeAge}</b> – لقد بلغ معدل الخطأ <a href='{url}' target='_blank'>{rate, plural, zero {<strong>#</strong> خطأ/الدقيقة} one {خطأ واحد (#)/الدقيقة} two {خطآن (#)/الدقيقة} few {# أخطاء/الدقيقة} many {# خطأ/الدقيقة} other {# خطأ/الدقيقة}}</a> حد إعدادات الموقع البالغ {limit, plural, zero {<strong>#</strong> خطأ/الدقيقة} one {خطأ واحد (#)/الدقيقة} two {خطآن (#)/الدقيقة} few {# أخطاء/الدقيقة} many {# خطأ/الدقيقة} other {# خطأ/الدقيقة}}."
@@ -1692,17 +1686,17 @@ ar:
       disclaimer: "يشير التسجيل إلى موافقتك على <a href='%{privacy_link}' target='blank'>سياسة الخصوصية</a> و<a href='%{tos_link}' target='blank'>شروط الخدمة</a>."
       failed: "حدث خطأ ما. قد يكون هذا البريد الإلكتروني مسجلًا بالفعل. جرِّب رابط نسيان كلمة المرور"
     forgot_password:
-      title: "إعادة تعيين كلمة المرور"
+      title: "إعادة ضبط كلمة المرور"
       action: "نسيت كلمة مروري"
-      invite: "أدخِل اسم المستخدم أو عنوان البريد الإلكتروني، وسنُرسل إليك رسالة إلكترونية لإعادة تعيين كلمة المرور."
+      invite: "أدخِل اسم المستخدم أو عنوان البريد الإلكتروني، وسنُرسل إليك رسالة إلكترونية لإعادة ضبط كلمة المرور."
       reset: "إعادة تعين كلمة المرور"
-      complete_username: "إذا تطابق أحد الحسابات مع اسم المستخدم <b>%{username}</b>، فستتلقى سريعًا رسالة إلكترونية تتضمَّن تعليمات عن كيفية إعادة تعيين كلمة المرور."
-      complete_email: "إذا تطابق أحد الحسابات مع <b>%{email}</b>، فستتلقى سريعًا رسالة إلكترونية تتضمَّن تعليمات عن كيفية إعادة تعيين كلمة المرور."
-      complete_username_found: "لقد عثرنا على حساب مطابق لاسم المستخدم <b>%{username}</b>. ومن المفترض أن تتلقى رسالة إلكترونية بإرشادات إعادة تعيين كلمة المرور قريبًا."
-      complete_email_found: "لقد عثرنا على حساب مطابق لعنوان البريد الإلكتروني <b>%{email}</b>. ومن المفترض أن تتلقى رسالة إلكترونية بإرشادات إعادة تعيين كلمة المرور قريبًا."
+      complete_username: "إذا تطابق أحد الحسابات مع اسم المستخدم <b>%{username}</b>، فستتلقى سريعًا رسالة إلكترونية تتضمَّن تعليمات عن كيفية إعادة ضبط كلمة المرور."
+      complete_email: "إذا تطابق أحد الحسابات مع <b>%{email}</b>، فستتلقى سريعًا رسالة إلكترونية تتضمَّن تعليمات عن كيفية إعادة ضبط كلمة المرور."
+      complete_username_found: "لقد عثرنا على حساب مطابق لاسم المستخدم <b>%{username}</b>. ومن المفترض أن تتلقى رسالة إلكترونية بإرشادات إعادة ضبط كلمة المرور قريبًا."
+      complete_email_found: "لقد عثرنا على حساب مطابق لعنوان البريد الإلكتروني <b>%{email}</b>. ومن المفترض أن تتلقى رسالة إلكترونية بإرشادات إعادة ضبط كلمة المرور قريبًا."
       complete_username_not_found: "لا يوجد حساب مطابق لاسم المستخدم <b>%{username}</b>"
       complete_email_not_found: "لا يوجد حساب مطابق لعنوان البريد الإلكتروني <b>%{email}</b>"
-      help: "لم تصلك الرسالة الإلكترونية بعد؟ احرص على التحقُّق من مجلد البريد غير المرغوب فيه أولًا.<p>لست متأكدًا من عنوان البريد الإلكتروني الذي استخدمته؟ أدخِل عنوان البريد الإلكتروني وسنخبرك إذا كان موجودًا هنا.</p><p>إذا فقدت الوصول إلى عنوان البريد الإلكتروني المرتبط بحسابك، يُرجى التواصل مع <a href='%{basePath}/about'>طاقم عملنا لمساعدتك.</a></p>"
+      help: "لم تصلك الرسالة الإلكترونية بعد؟ احرص على التحقُّق من مجلد البريد غير المرغوب فيه أولًا.<p>لست متأكدًا من عنوان البريد الإلكتروني الذي استخدمته؟ أدخِل عنوان البريد الإلكتروني وسنخبرك إذا كان موجودًا هنا.</p><p>إذا فقدت الوصول إلى عنوان البريد الإلكتروني المرتبط بحسابك، يُرجى التواصل مع <a href='%{basePath}/about'>فريق عملنا لمساعدتك.</a></p>"
       button_ok: "حسنًا"
       button_help: "المساعدة"
     email_login:
@@ -1737,7 +1731,7 @@ ar:
       security_key_support_missing_error: "لا يدعم جهازك أو متصفحك الحالي استخدام مفاتيح الأمان. يُرجى استخدام طريقة مختلفة."
       caps_lock_warning: "مفتاح Caps Lock مفعَّل"
       error: "خطأ غير معروف"
-      cookies_error: "يبدو أن ملفات تعريف الارتباط في متصفحك معطَّلة. قد لا تتمكن من تسجيل الدخول قبل تفعيلها أولًا."
+      cookies_error: "يبدو أن ملفات تعريف الارتباط في متصفحك متوقفة. قد لا تتمكن من تسجيل الدخول قبل تفعيلها أولًا."
       rate_limit: "يُرجى الانتظار قبل محاولة تسجيل الدخول مرة أخرى."
       blank_username: "يُرجى إدخال بريدك الإلكتروني أو اسم المستخدم."
       blank_username_or_password: "يُرجى إدخال بريدك الإلكتروني أو اسم المستخدم، وكلمة المرور."
@@ -1746,7 +1740,7 @@ ar:
       or: "أو"
       authenticating: "جارٍ المصادقة..."
       awaiting_activation: "ما زال حسابك بانتظار التفعيل، استخدم رابط \"نسيت كلمة المرور\" لإرسال رسالة إلكترونية أخرى للتفعيل."
-      awaiting_approval: "لم يوافق أي من أعضاء طاقم العمل على حسابك بعد. سنُرسل إليك رسالة إلكترونية عند الموافقة عليه."
+      awaiting_approval: "لم يوافق أي من أعضاء فريق العمل على حسابك بعد. سنُرسل إليك رسالة إلكترونية عند الموافقة عليه."
       requires_invite: "عذرًا، الوصول إلى هذا المنتدى مقصور على أصحاب الدعوات فقط."
       not_activated: "لا يمكنك تسجيل الدخول بعد. لقد أرسلنا سابقًا رسالة إلكترونية للتفعيل إلى <b>%{sentTo}</b>. يُرجى اتباع الإرشادات الواردة في هذه الرسالة لتفعيل حسابك."
       not_allowed_from_ip_address: "لا يمكنك تسجيل الدخول من عنوان IP هذا."
@@ -1847,12 +1841,12 @@ ar:
         many: "حدِّد %{count} عنصرًا على الأقل."
         other: "حدِّد %{count} عنصر على الأقل."
       invalid_selection_length:
-        zero: "يجب ألا يقل الاختيار عن %{count} حرف على الأقل."
-        one: "يجب ألا يقل الاختيار عن حرف واحد (%{count}) على الأقل."
-        two: "يجب ألا يقل الاختيار عن حرفين (%{count}) على الأقل."
-        few: "يجب ألا يقل الاختيار عن %{count} أحرف على الأقل."
-        many: "يجب ألا يقل الاختيار عن %{count} حرفًا على الأقل."
-        other: "يجب ألا يقل الاختيار عن %{count} حرف على الأقل."
+        zero: "يجب ألا يقل التحديد عن %{count} حرف على الأقل."
+        one: "يجب ألا يقل التحديد عن حرف واحد (%{count}) على الأقل."
+        two: "يجب ألا يقل التحديد عن حرفين (%{count}) على الأقل."
+        few: "يجب ألا يقل التحديد عن %{count} أحرف على الأقل."
+        many: "يجب ألا يقل التحديد عن %{count} حرفًا على الأقل."
+        other: "يجب ألا يقل التحديد عن %{count} حرف على الأقل."
       components:
         categories_admin_dropdown:
           title: "إدارة الفئات"
@@ -1914,7 +1908,7 @@ ar:
         other: "تشير الإشارة إلى %{group} أنك على وشك إرسال إشعار إلى <a href='%{group_link}'>%{count} شخص)</a>. هل أنت متأكد؟"
       cannot_see_mention:
         category: "لقد أشرت إلى %{username}، لكنه لن يتلقي إشعارًا لأنه ليس لديه إذن بالوصول إلى هذه الفئة. عليك إضافته إلى إحدى المجموعات التي لديها إذن بالوصول إلى هذه الفئة."
-        private: "لقد أشرت إلى %{username}، ولكن لن يتم إشعاره لأنه لا يمكنه رؤية هذه الرسالة الشخصية. عليك دعوته إلى هذه الرسالة الشخصية."
+        private: "لقد أشرت إلى %{username}، ولكن لن يتم إشعاره لأنه لا يمكنه رؤية هذه الرسالة الخاصة. عليك دعوته إلى هذه الرسالة الخاصة."
       duplicate_link: "يبدو أن رابطك إلى <b>%{domain}</b> قدم تم نشره في الموضوع بواسطة <b>@%{username}</b> في <a href='%{post_url}'>رد بتاريخ %{ago}</a>. هل تريد بالتأكيد نشره مرة أخرى؟"
       reference_topic_title: "بخصوص: %{title}"
       error:
@@ -1929,7 +1923,7 @@ ar:
           few: "عليك اختيار %{count} وسوم على الأقل"
           many: "عليك اختيار %{count} وسمًا على الأقل"
           other: "عليك اختيار %{count} وسم على الأقل"
-        topic_template_not_modified: "يُرجى إضافة التفاصيل والمواصفات المحدَّدة إلى موضوعك من خلال تعديل قالب الموضوع."
+        topic_template_not_modified: "يُرجى إضافة التفاصيل والمواصفات المحدَّدة إلى موضوعك من خلال تعديل نموذج الموضوع."
       save_edit: "حفظ التعديل"
       overwrite_edit: "استبدال التعديل"
       reply_original: "كتابة رد على الموضوع الأصلي"
@@ -1950,7 +1944,7 @@ ar:
       remove_featured_link: "أزِل الرابط من الموضوع."
       reply_placeholder: "اكتب هنا. استخدم Markdown أو BBCode أو HTML للتنسيق. اسحب الصور أو الصقها."
       reply_placeholder_no_images: "اكتب هنا. استخدم Markdown أو BBCode أو HTML للتنسيق."
-      reply_placeholder_choose_category: "اختر فئةً قبل الكتابة هنا."
+      reply_placeholder_choose_category: "حدِّد فئةً قبل الكتابة هنا."
       view_new_post: "اعرض منشورك الجديد."
       saving: "جارٍ الحفظ"
       saved: "تم الحفظ!"
@@ -1993,7 +1987,7 @@ ar:
       yourself_confirm:
         title: "هل نسيت إضافة المستلمين؟"
         body: "هذه الرسالة يتم إرسالها إليك فقط في الوقت الحالي!"
-      admin_options_title: "إعدادات طاقم العمل الاختيارية لهذا الموضوع"
+      admin_options_title: "إعدادات فريق العمل الاختيارية لهذا الموضوع"
       composer_actions:
         reply: الرد
         draft: مسودة
@@ -2007,16 +2001,15 @@ ar:
           confirm: لديك مسودة موضوع جديد تم حفظها، وسيتم استبدالها إذا أنشأت موضوعًا مرتبطًا.
         reply_as_new_group_message:
           label: الرد كرسالة جديدة للمجموعة
-          desc: إنشاء رسالة خاصة جديدة مع المستلمين أنفسهم
         reply_as_private_message:
           label: رسالة جديدة
-          desc: إنشاء رسالة شخصية جديدة
+          desc: إنشاء رسالة خاصة جديدة
         reply_to_topic:
           label: الرد على الموضوع
           desc: الرد على الموضوع، وليس أي منشور محدَّد
         toggle_whisper:
           label: تفعيل الهمس
-          desc: تكون الهمسات مرئية لأعضاء طاقم العمل فقط
+          desc: تكون الهمسات مرئية لأعضاء فريق العمل فقط
         create_topic:
           label: "موضوع جديد"
         shared_draft:
@@ -2110,7 +2103,7 @@ ar:
         quoted: 'اقتبس %{username} كلامك في "%{topic}" - ‏%{site_title}'
         replied: 'ردَّ %{username} عليك في "%{topic}" - ‏%{site_title}'
         posted: 'نشر %{username} منشورًا في "%{topic}" - ‏%{site_title}'
-        private_message: 'أرسل %{username} إليك رسالة شخصية في "%{topic}" -‏ %{site_title}'
+        private_message: 'أرسل %{username} إليك رسالة خاصة في "%{topic}" -‏ %{site_title}'
         linked: 'وضع %{username} رابطًا لمنشورك من "%{topic}" - %{site_title}'
         watching_first_post: 'أنشأ %{username} موضوعًا جديدًا: "%{topic}" -‏ %{site_title}'
         confirm_title: "تم تفعيل الإشعارات - %{site_title}"
@@ -2230,7 +2223,7 @@ ar:
         clear_all: "مسح الكل"
         unlist_topics: "إلغاء إدراج الموضوعات"
         relist_topics: "إعادة إدراج الموضوعات"
-        reset_read: "إعادة تعيين القراءة"
+        reset_read: "إعادة ضبط القراءة"
         delete: "حذف الموضوعات"
         dismiss: "تجاهل"
         dismiss_read: "تجاهل جميع الموضوعات غير المقروءة"
@@ -2359,7 +2352,7 @@ ar:
         title: "الوضع البطيء"
         select: "لا يمكن للمستخدمين النشر في هذا الموضوع إلا مرة كل:"
         enable: "تفعيل"
-        remove: "تعطيل"
+        remove: "إيقاف"
         hours: "الساعات:"
         minutes: "الدقائق:"
         seconds: "الثواني:"
@@ -2505,14 +2498,14 @@ ar:
         archive: "أرشفة الموضوع"
         invisible: "إلغاء الإدراج"
         visible: "إدراج"
-        reset_read: "إعادة تعيين بيانات القراءة"
+        reset_read: "إعادة ضبط بيانات القراءة"
         make_public: "التحويل إلى موضوع عام"
-        make_private: "التحويل إلى رسالة شخصية"
-        reset_bump_date: "إعادة تعيين تاريخ الرفع"
+        make_private: "التحويل إلى رسالة خاصة"
+        reset_bump_date: "إعادة ضبط تاريخ الرفع"
       feature:
         pin: "تثبيت الموضوع"
         unpin: "إلغاء تثبيت الموضوع"
-        pin_globally: "تثبيت الموضوع بشكلٍ عمومي"
+        pin_globally: "تثبيت الموضوع بشكلٍ عام"
         remove_banner: "إزالة الموضوع البانر"
       reply:
         title: "الرد"
@@ -2549,23 +2542,23 @@ ar:
           other: "الموضوعات المثبَّتة حاليًا في %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "جعل هذا الموضوع يظهر أعلى قوائم الموضوعات حتى"
         confirm_pin_globally:
-          zero: "لديك بالفعل %{count} موضوع مثبَّت بشكلٍ عمومي. قد تصبح كثرة الموضوعات المثبَّتة مصدر إزعاج للمستخدمين الجُدد والمجهولين. هل تريد بالتأكيد تثبيت موضوع آخر بشكلٍ عمومي؟"
-          one: "لديك بالفعل موضوع واحد (%{count}) مثبَّت بشكلٍ عمومي. قد تصبح كثرة الموضوعات المثبَّتة مصدر إزعاج للمستخدمين الجُدد والمجهولين. هل تريد بالتأكيد تثبيت موضوع آخر بشكلٍ عمومي؟"
-          two: "لديك بالفعل موضوعان (%{count}) مثبَّتان بشكلٍ عمومي. قد تصبح كثرة الموضوعات المثبَّتة مصدر إزعاج للمستخدمين الجُدد والمجهولين. هل تريد بالتأكيد تثبيت موضوع آخر بشكلٍ عمومي؟"
-          few: "لديك بالفعل %{count} موضوعات مثبَّتة بشكلٍ عمومي. قد تصبح كثرة الموضوعات المثبَّتة مصدر إزعاج للمستخدمين الجُدد والمجهولين. هل تريد بالتأكيد تثبيت موضوع آخر بشكلٍ عمومي؟"
-          many: "لديك بالفعل %{count} موضوعًا مثبَّتًا بشكلٍ عمومي. قد تصبح كثرة الموضوعات المثبَّتة مصدر إزعاج للمستخدمين الجُدد والمجهولين. هل تريد بالتأكيد تثبيت موضوع آخر بشكلٍ عمومي؟"
-          other: "لديك بالفعل %{count} موضوع مثبَّت بشكلٍ عمومي. قد تصبح كثرة الموضوعات المثبَّتة مصدر إزعاج للمستخدمين الجُدد والمجهولين. هل تريد بالتأكيد تثبيت موضوع آخر بشكلٍ عمومي؟"
+          zero: "لديك بالفعل %{count} موضوع مثبَّت بشكلٍ عام. قد تصبح كثرة الموضوعات المثبَّتة مصدر إزعاج للمستخدمين الجُدد والمجهولين. هل تريد بالتأكيد تثبيت موضوع آخر بشكلٍ عام؟"
+          one: "لديك بالفعل موضوع واحد (%{count}) مثبَّت بشكلٍ عام. قد تصبح كثرة الموضوعات المثبَّتة مصدر إزعاج للمستخدمين الجُدد والمجهولين. هل تريد بالتأكيد تثبيت موضوع آخر بشكلٍ عام؟"
+          two: "لديك بالفعل موضوعان (%{count}) مثبَّتان بشكلٍ عام. قد تصبح كثرة الموضوعات المثبَّتة مصدر إزعاج للمستخدمين الجُدد والمجهولين. هل تريد بالتأكيد تثبيت موضوع آخر بشكلٍ عام؟"
+          few: "لديك بالفعل %{count} موضوعات مثبَّتة بشكلٍ عام. قد تصبح كثرة الموضوعات المثبَّتة مصدر إزعاج للمستخدمين الجُدد والمجهولين. هل تريد بالتأكيد تثبيت موضوع آخر بشكلٍ عام؟"
+          many: "لديك بالفعل %{count} موضوعًا مثبَّتًا بشكلٍ عام. قد تصبح كثرة الموضوعات المثبَّتة مصدر إزعاج للمستخدمين الجُدد والمجهولين. هل تريد بالتأكيد تثبيت موضوع آخر بشكلٍ عام؟"
+          other: "لديك بالفعل %{count} موضوع مثبَّت بشكلٍ عام. قد تصبح كثرة الموضوعات المثبَّتة مصدر إزعاج للمستخدمين الجُدد والمجهولين. هل تريد بالتأكيد تثبيت موضوع آخر بشكلٍ عام؟"
         unpin_globally: "إزالة هذا الموضوع من أعلى جميع قوائم الموضوعات"
         unpin_globally_until: "إزالة هذا الموضوع من أعلى جميع قوائم الموضوعات أو الانتظار حتى <strong>%{until}</strong>."
         global_pin_note: "يمكن للمستخدمين إلغاء تثبيت الموضوع بشكلٍ فردي لأنفسهم."
-        not_pinned_globally: "لا توجد موضوعات مثبَّتة بشكلٍ عمومي."
+        not_pinned_globally: "لا توجد موضوعات مثبَّتة بشكلٍ عام."
         already_pinned_globally:
-          zero: "الموضوعات المثبَّتة حاليًا بشكلٍ عمومي: <strong class='badge badge-notification unread'>%{count}</strong>"
-          one: "الموضوعات المثبَّتة حاليًا بشكلٍ عمومي: <strong class='badge badge-notification unread'>%{count}</strong>"
-          two: "الموضوعات المثبَّتة حاليًا بشكلٍ عمومي: <strong class='badge badge-notification unread'>%{count}</strong>"
-          few: "الموضوعات المثبَّتة حاليًا بشكلٍ عمومي: <strong class='badge badge-notification unread'>%{count}</strong>"
-          many: "الموضوعات المثبَّتة حاليًا بشكلٍ عمومي: <strong class='badge badge-notification unread'>%{count}</strong>"
-          other: "الموضوعات المثبَّتة حاليًا بشكلٍ عمومي: <strong class='badge badge-notification unread'>%{count}</strong>"
+          zero: "الموضوعات المثبَّتة حاليًا بشكلٍ عام: <strong class='badge badge-notification unread'>%{count}</strong>"
+          one: "الموضوعات المثبَّتة حاليًا بشكلٍ عام: <strong class='badge badge-notification unread'>%{count}</strong>"
+          two: "الموضوعات المثبَّتة حاليًا بشكلٍ عام: <strong class='badge badge-notification unread'>%{count}</strong>"
+          few: "الموضوعات المثبَّتة حاليًا بشكلٍ عام: <strong class='badge badge-notification unread'>%{count}</strong>"
+          many: "الموضوعات المثبَّتة حاليًا بشكلٍ عام: <strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "الموضوعات المثبَّتة حاليًا بشكلٍ عام: <strong class='badge badge-notification unread'>%{count}</strong>"
         make_banner: "تحويل هذا الموضوع إلى إعلان يظهر في أعلى جميع الصفحات."
         remove_banner: "إزالة البانر الذي يظهر في أعلى جميع الصفحات"
         banner_note: "يمكن للمستخدمين تجاهل البانر بإغلاقه. ولا يمكن تحويل أكثر من موضوع واحد إلى بانر في الوقت نفسه."
@@ -2713,7 +2706,7 @@ ar:
           label: "تحديد"
           title: "إضافة المنشور إلى التحديد"
         selected_post:
-          label: "تم تحديده"
+          label: "محدَّد"
           title: "انقر لإزالة المنشور من التحديد"
         select_replies:
           label: "تحديد المنشور +الردود"
@@ -2746,7 +2739,7 @@ ar:
       show_hidden: "عرض المحتوى الذي تم تجاهله"
       collapse: "طي"
       expand_collapse: "توسيع/طي"
-      locked: "قفل أحد أعضاء طاقم العمل تعديل هذه المشاركة"
+      locked: "قفل أحد أعضاء فريق العمل تعديل هذه المشاركة"
       gap:
         zero: "عرض %{count} رد مخفي"
         one: "عرض رد مخفي واحد (%{count})"
@@ -2805,8 +2798,6 @@ ar:
       whisper: "هذا المنشور عبارة عن همسة خاصة للمشرفين"
       wiki:
         about: "هذا المنشور عبارة عن Wiki"
-      archetypes:
-        save: "خيارات الحفظ"
       few_likes_left: "نشكرك على نشر المحبة في المجتمع! و لكن للأسف لقد اقتربت من الحد اليومي المسموح به لمرات تسجيل الإعجاب."
       controls:
         reply: "ابدأ في كتابة رد على هذا المنشور"
@@ -2842,8 +2833,8 @@ ar:
         admin: "إجراءات المسؤول على المنشور"
         wiki: "التحويل إلى Wiki"
         unwiki: "إزالة Wiki"
-        convert_to_moderator: "لون إضافة طاقم العمل"
-        revert_to_regular: "لون إزالة طاقم العمل"
+        convert_to_moderator: "لون إضافة فريق العمل"
+        revert_to_regular: "لون إزالة فريق العمل"
         rebake: "إعادة صياغة HTML"
         publish_page: "نشر الصفحة"
         unhide: "إظهار"
@@ -2852,16 +2843,16 @@ ar:
         lock_post: "قفل المنشور"
         lock_post_description: "امنع كاتب المنشور من تعديله"
         unlock_post: "إلغاء قفل المنشور"
-        unlock_post_description: "اسمح لكاتب المنشور بتعديله"
+        unlock_post_description: "اسمح لكاتب المشاركة تعديلها"
         delete_topic_disallowed_modal: "ليس لديك إذن بحذف هذا الموضوع. إذا كنت تريد حقًا حذفه، فأبلِغ عنه مع ذكر السبب للفت انتباه أحد المشرفين إليه."
         delete_topic_disallowed: "ليس لديك الإذن بحذف هذا الموضوع"
         delete_topic_confirm_modal_yes: "نعم، حذف هذا الموضوع"
         delete_topic_confirm_modal_no: "لا، الاحتفاظ بهذا الموضوع"
         delete_topic_error: "حدث خطأ في أثناء حذف هذا الموضوع"
         delete_topic: "حذف الموضوع"
-        add_post_notice: "إضافة إخطار من طاقم العمل"
-        change_post_notice: "تغيير إخطار طاقم العمل"
-        delete_post_notice: "حذف إخطار طاقم العمل"
+        add_post_notice: "إضافة إشعار من فريق العمل"
+        change_post_notice: "تغيير إشعار فريق العمل"
+        delete_post_notice: "حذف إشعار فريق العمل"
         remove_timer: "إزالة المؤقِّت"
       actions:
         people:
@@ -2970,7 +2961,6 @@ ar:
         post_number: "%{username}، المنشور #%{post_number}"
         show_all: "إظهار الكل"
     category:
-      can: "يمكن&hellip; "
       none: "(بلا فئة)"
       all: "كل الفئات"
       choose: "الفئة&hellip;"
@@ -3004,7 +2994,6 @@ ar:
       save_error: حدث خطأ في أثناء حفظ الفئة.
       name: "اسم الفئة"
       description: "الوصف"
-      topic: "موضوع الفئة"
       logo: "صورة شعار الفئة"
       background_image: "صورة خلفية الفئة"
       badge_colors: "ألوان الشارات"
@@ -3025,19 +3014,19 @@ ar:
         see: "العرض"
         reply: "الرد"
         create: "إنشاء"
-        no_groups_selected: "لم يتم منح إذن الوصول لأي مجموعة؛ لذا فإن هذه الفئة ستكون مرئية لطاقم العمل فقط."
+        no_groups_selected: "لم يتم منح إذن الوصول لأي مجموعة؛ لذا فإن هذه الفئة ستكون مرئية لفريق العمل فقط."
         everyone_has_access: 'هذه الفئة عامة، ويمكن للجميع رؤية المنشورات والرد عليها وإنشائها. لتقييد الأذونات، عليك إزالة واحد أو أكثر من الأذونات الممنوحة لمجموعة "الجميع".'
         toggle_reply: "إذن تفعيل الرد"
         toggle_full: "إذن تفعيل الإنشاء"
         inherited: 'هذا الإذن مكتسب من "الجميع"'
       special_warning: "تحذير: هذه الفئة مصنَّفة مسبقًا ولا يمكن تعديل إعدادات الأمان لها. إذا كنت لا ترغب في استخدام هذه الفئة، فعليك حذفها بدلًا من إعادة توظيفها."
       uncategorized_security_warning: "هذه الفئة خاصة. وتهدف إلى جمع الموضوعات التي لا تنتمي إلى أي فئة، ولا يمكنك ضبط إعدادات حماية لها."
-      uncategorized_general_warning: 'هذه الفئة خاصة. ويتم استخدامها كفئة افتراضية للموضوعات الجديدة التي لا تنتمي إلى أي فئة. إذا أردت منع هذا السلوك وفرض اختيار الفئة، <a href="%{settingLink}">يُرجى تعطيل هذا الإعداد من هنا</a>. إذا أردت تغيير اسم الفئة أو وصفها، فانتقل إلى <a href="%{customizeLink}">التخصيص/المحتوى النصي</a>.'
+      uncategorized_general_warning: 'هذه الفئة خاصة. ويتم استخدامها كفئة افتراضية للموضوعات الجديدة التي لا تنتمي إلى أي فئة. إذا أردت منع هذا السلوك وفرض تحديد الفئة، <a href="%{settingLink}">يُرجى إيقاف هذا الإعداد من هنا</a>. إذا أردت تغيير اسم الفئة أو وصفها، فانتقل إلى <a href="%{customizeLink}">التخصيص/المحتوى النصي</a>.'
       pending_permission_change_alert: "لم تُضف المجموعة %{group} إلى هذه الفئة، انقر على هذا الزر لإضافتها."
       images: "الصور"
-      email_in: "عنوان مخصَّص للبريد الوارد:"
+      email_in: "العنوان المخصَّص للبريد الوارد:"
       email_in_allow_strangers: "قبول الرسائل الإلكترونية من المستخدمين المجهولين الذين لا يملكون حسابات"
-      email_in_disabled: "تم تعطيل نشر الموضوعات الجديدة عبر البريد الإلكتروني في إعدادات الموقع. لتفعيل نشر الموضوعات الجديدة عبر البريد الإلكتروني، "
+      email_in_disabled: "تم إيقاف نشر الموضوعات الجديدة عبر البريد الإلكتروني في إعدادات الموقع. لتفعيل نشر الموضوعات الجديدة عبر البريد الإلكتروني، "
       email_in_disabled_click: 'فعليك تفعيل خيار "email in" في الإعدادات.'
       mailinglist_mirror: "الفئة تعكس قائمة بريدية"
       show_subcategory_list: "اعرض قائمة الفئات الفرعية أعلى الموضوعات في هذه الفئة."
@@ -3052,7 +3041,7 @@ ar:
       default_list_filter: "تصفية القائمة الافتراضية:"
       allow_badges_label: "السماح بمنح الشارات في هذه الفئة"
       edit_permissions: "تعديل الأذونات"
-      reviewable_by_group: "بالإضافة إلى طاقم العمل، يمكن أيضًا مراجعة المحتوى في هذه الفئة بواسطة:"
+      reviewable_by_group: "بالإضافة إلى فريق العمل، يمكن أيضًا مراجعة المحتوى في هذه الفئة بواسطة:"
       review_group_name: "اسم المجموعة"
       require_topic_approval: "طلب موافقة المشرف على جميع الموضوعات الجديدة"
       require_reply_approval: "طلب موافقة المشرف على جميع الردود الجديدة"
@@ -3119,13 +3108,13 @@ ar:
       take_action_options:
         default:
           title: "اتخاذ إجراء"
-          details: "الوصول إلى الحد الأدنى للبلاغات على الفور بدلًا من انتظار المزيد من البلاغات من أعضاء المجتمع."
+          details: "الوصول إلى الحد الأقصى للبلاغات على الفور بدلًا من انتظار المزيد من البلاغات من أعضاء المجتمع."
         suspend:
           title: "تعليق المستخدم"
-          details: "الوصول إلى الحد الأدنى للبلاغات وتعليق المستخدم"
+          details: "الوصول إلى الحد الأقصى للبلاغات وتعليق المستخدم"
         silence:
           title: "كتم المستخدم"
-          details: "الوصول إلى الحد الأعلى للبلاغات، وكتم المستخدم"
+          details: "الوصول إلى الحد الأقصى للبلاغات، وكتم المستخدم"
       notify_action: "رسالة"
       official_warning: "تحذير رسمي"
       delete_spammer: "حذف صاحب الأسلوب غير المرغوب فيه"
@@ -3133,9 +3122,9 @@ ar:
       ip_address_missing: "(لا يوجد)"
       hidden_email_address: "(مخفي)"
       submit_tooltip: "إرسال البلاغ الخاص"
-      take_action_tooltip: "الوصول إلى الحد الأدنى للبلاغات على الفور بدلًا من انتظار المزيد من البلاغات من أعضاء المجتمع."
+      take_action_tooltip: "الوصول إلى الحد الأقصى للبلاغات على الفور بدلًا من انتظار المزيد من البلاغات من أعضاء المجتمع."
       cant: "عذرًا، لا يمكنك الإبلاغ عن هذا المنشور في الوقت الحالي."
-      notify_staff: "إرسال إشعار إلى طاقم العمل بشكلٍ خاص"
+      notify_staff: "إرسال إشعار إلى فريق العمل بشكلٍ خاص"
       formatted_name:
         off_topic: "خارج عن الموضوع"
         inappropriate: "غير لائق"
@@ -3204,16 +3193,16 @@ ar:
         title: "غير مثبَّت"
         help: "هذا الموضوع غير مثبّت لك، وسيتم عرضه بالترتيب العادي"
       pinned_globally:
-        title: "مثبَّت بشكلٍ عمومي"
-        help: "هذا الموضوع مثبَّت بشكل عمومي؛ لذا فإنه سيظهر في أعلى صفحة أحدث الموضوعات وفي أعلى فئته."
+        title: "مثبَّت بشكلٍ عام"
+        help: "هذا الموضوع مثبَّت بشكلٍ عام؛ لذا فإنه سيظهر في أعلى صفحة أحدث الموضوعات وفي أعلى فئته."
       pinned:
         title: "مثبَّت"
         help: "هذا الموضوع مثبَّت لك وسيتم عرضه في أعلى فئته"
       unlisted:
         help: "هذا الموضوع غير مدرج؛ لذا فإنه لن يظهر في قوائم الموضوعات، ولا يمكن الوصول إليه إلا برابط مباشر"
       personal_message:
-        title: "هذا الموضوع عبارة عن رسالة شخصية"
-        help: "هذا الموضوع عبارة عن رسالة شخصية"
+        title: "هذا الموضوع عبارة عن رسالة خاصة"
+        help: "هذا الموضوع عبارة عن رسالة خاصة"
     posts: "المنشورات"
     original_post: "المنشور الأصلي"
     views: "مرات العرض"
@@ -3574,7 +3563,7 @@ ar:
         other: "%{tags} و%{count} وسم آخر"
       delete_no_unused_tags: "لا توجد وسوم غير مستخدمة:"
       delete_unused: "حذف الوسوم غير المستخدمة"
-      delete_unused_description: "حذف جميع الوسوم غير المرتبطة بأي موضوعات أو رسائل شخصية"
+      delete_unused_description: "حذف جميع الوسوم غير المرتبطة بأي موضوعات أو رسائل خاصة"
       cancel_delete_unused: "إلغاء"
       filters:
         without_category: "%{filter} موضوعات %{tag}"
@@ -3722,7 +3711,7 @@ ar:
           monthly: شهريًا
           weekly: أسبوعيًا
           groups: "كل المجموعات"
-          disabled: "هذا التقرير معطَّل"
+          disabled: "هذا التقرير متوقف"
           total: "إجمالي الوقت الكلي"
           no_data: "لا توجد بيانات لعرضها."
           filters:
@@ -3759,7 +3748,7 @@ ar:
             trust_levels_title: "مستوى الثقة الذي يتم منحه للأعضاء تلقائيًا عند إضافتهم:"
             trust_levels_none: "لا يوجد"
             automatic_membership_email_domains: "ستتم إضافة المستخدمين الذين يسجِّلون بنطاق بريد إلكتروني مطابق لنطاق في هذه القائمة إلى هذه المجموعة تلقائيًا:"
-            primary_group: "التعيين تلقائيًا كمجموعة أساسية"
+            primary_group: "الضبط تلقائيًا كمجموعة أساسية"
         name_placeholder: "اسم المجموعة بلا مسافات، على غرار قاعدة اسم المستخدم"
         primary: "المجموعة الأساسية"
         no_primary: "(لا توجد مجموعة أساسية)"
@@ -3891,8 +3880,8 @@ ar:
             label: "تفعيل القراءة فقط"
             confirm: "هل تريد بالتأكيد تفعيل وضع القراءة فقط؟"
           disable:
-            title: "تعطيل وضع القراءة فقط"
-            label: "تعطيل القراءة فقط"
+            title: "إيقاف وضع القراءة فقط"
+            label: "إيقاف القراءة فقط"
         logs:
           none: "لا توجد سجلات بعد..."
         columns:
@@ -3922,9 +3911,9 @@ ar:
             alert: "تم مراسلتك عبر البريد الإلكتروني برابط تنزيل هذه النسخة الاحتياطية."
           destroy:
             title: "إزالة النسخة الاحتياطية"
-            confirm: "هل تريد بالتأكيد إتلاف هذه النسخة الاحتياطية؟"
+            confirm: "هل تريد بالتأكيد مسح هذه النسخة الاحتياطية؟"
           restore:
-            is_disabled: "الاستعادة معطَّلة في إعدادات الموقع."
+            is_disabled: "الاستعادة متوقفة في إعدادات الموقع."
             label: "استعادة"
             title: "استعادة النسخة الاحتياطية"
             confirm: "هل تريد بالتأكيد استعادة هذه النسخة الاحتياطية؟"
@@ -3942,7 +3931,7 @@ ar:
         button_text: "التصدير"
         button_title:
           user: "تصدير قائمة بجميع المستخدمين بتنسيق CSV"
-          staff_action: "تصدير سجل إجراءات طاقم العمل الكامل بتنسيق CSV"
+          staff_action: "تصدير سجل إجراءات فريق العمل الكامل بتنسيق CSV"
           screened_email: "تصدير القائمة الكاملة بتنسيق CSV لعناوين البريد الإلكتروني الخاضعة للمراقبة."
           screened_ip: "تصدير القائمة الكاملة بتنسيق CSV لعناوين IP الخاضعة للمراقبة."
           screened_url: "تصدير القائمة الكاملة بتنسيق CSV لعناوين URL الخاضعة للمراقبة."
@@ -3972,7 +3961,7 @@ ar:
         email_templates:
           title: "البريد الإلكتروني"
           subject: "الموضوع"
-          multiple_subjects: "توجد موضوعات متعددة في قالب البريد الإلكتروني هذا."
+          multiple_subjects: "توجد موضوعات متعددة في نموذج البريد الإلكتروني هذا."
           body: "النص"
           revert: "التراجع عن التغييرات"
           revert_confirm: "هل تريد بالتأكيد التراجع عن التغييرات؟"
@@ -4003,7 +3992,7 @@ ar:
           convert_theme_alert: "هل تريد بالتأكيد تحويل هذه السمة إلى مكوِّن؟ ستتم إزالته كعنصر رئيسي من %{relatives}."
           inactive_themes: "السمات غير النشطة:"
           inactive_components: "المكوِّنات غير المستخدمة:"
-          disabled_component_tooltip: "لقد تم تعطيل هذا المكوِّن"
+          disabled_component_tooltip: "لقد تم إيقاف هذا المكوِّن"
           default_theme_tooltip: "هذه السمة هي السمة الافتراضية للموقع"
           updates_available_tooltip: "تتوفَّر تحديثات لهذه السمة"
           collapse: طي
@@ -4029,9 +4018,9 @@ ar:
           version: "الإصدار:"
           source_url: "المصدر"
           enable: "تفعيل"
-          disable: "تعطيل"
-          disabled: "لقد تم تعطيل هذا المكوِّن."
-          disabled_by: "لقد تم تعطيل هذا المكوِّن بواسطة"
+          disable: "إيقاف"
+          disabled: "لقد تم إيقاف هذا المكوِّن."
+          disabled_by: "لقد تم إيقاف هذا المكوِّن بواسطة"
           update_to_latest: "تحديث إلى الإصدار الأخير"
           check_for_updates: "التحقُّق من وجود تحديثات"
           updating: "جارٍ التحديث..."
@@ -4076,7 +4065,7 @@ ar:
             title: "HTML الذي سيتم إدراجه قبل وسم ‎</body>‎"
         colors:
           select_base:
-            title: "اختيار لوحة الألوان الأساسية"
+            title: "تحديد لوحة الألوان الأساسية"
             description: "لوحة الألوان الأساسية:"
           title: "الألوان"
           edit: "تعديل لوحات الألوان"
@@ -4088,7 +4077,7 @@ ar:
           undo: "تراجع"
           undo_title: "يمكنك التراجع عن التغييرات التي أجريتها على هذا اللون منذ آخر مرة تم حفظه."
           revert: "تراجع"
-          revert_title: "إعادة تعيين هذا اللون إلى لوحة ألوان Discourse الافتراضية"
+          revert_title: "إعادة ضبط هذا اللون إلى لوحة ألوان Discourse الافتراضية"
           primary:
             name: "الأساسي"
             description: "أغلب النصوص، والأيقونات، والحدود."
@@ -4124,9 +4113,9 @@ ar:
         email_style:
           title: "نمط الرسالة الإلكترونية"
           heading: "تخصيص نمط الرسالة الإلكترونية"
-          html: "قالب HTML"
+          html: "نموذج HTML"
           css: "CSS"
-          reset: "إعادة التعيين إلى الافتراضي"
+          reset: "إعادة الضبط على الافتراضي"
           save_error_with_reason: "لم يتم حفظ تغييراتك. %{error}"
       email:
         title: "الرسائل الإلكترونية"
@@ -4219,7 +4208,7 @@ ar:
         staff_actions:
           all: "الكل"
           filter: "المرشح:"
-          title: "إجراءات طاقم العمل"
+          title: "إجراءات فريق العمل"
           clear_filters: "إظهار كل شيء"
           staff_user: "المستخدم"
           target_user: "المستخدم المستهدف"
@@ -4263,12 +4252,12 @@ ar:
             renamed_tag: "إعادة تسمية الوسم"
             revoke_email: "إلغاء البريد الإلكتروني"
             lock_trust_level: "قفل مستوى الثقة"
-            unlock_trust_level: "فتح مستوى الثقة"
+            unlock_trust_level: "إلغاء قفل مستوى الثقة"
             activate_user: "تفعيل المستخدم"
             deactivate_user: "إلغاء تفعيل المستخدم"
             change_readonly_mode: "تغيير وضع القراءة فقط"
             backup_download: "تنزيل النسخة الاحتياطية"
-            backup_destroy: "إتلاف النسخة الاحتياطية"
+            backup_destroy: "مسح النسخة الاحتياطية"
             reviewed_post: "مراجعة المنشور"
         screened_emails:
           title: "عناوين البريد الإلكتروني الخاضعة للمراقبة"
@@ -4321,8 +4310,8 @@ ar:
           silence: "كتم"
           link: "رابط"
         action_descriptions:
-          require_approval: "ستتطلب المنشورات التي تتضمَّن هذه الكلمات موافقة طاقم العمل قبل أن تصبح رؤيتها ممكنة."
-          flag: "اسمح بالمنشورات التي تتضمَّن هذه الكلمات، ولكن أبلغ عنها كغير لائقة حتى يتمكَّن المشرفون من مراجعتها."
+          require_approval: "ستتطلب المنشورات التي تتضمَّن هذه الكلمات موافقة فريق العمل قبل أن تصبح رؤيتها ممكنة."
+          flag: "اسمح بالمنشورات التي تتضمَّن هذه الكلمات، ولكن أبلغ عنها كغير لائقة حتى يتمكن المشرفون من مراجعتها."
         form:
           placeholder_regexp: "تعبير عادي"
           link_label: "رابط"
@@ -4348,7 +4337,7 @@ ar:
         nav:
           new: "جديد"
           active: "نشط"
-          staff: "طاقم العمل"
+          staff: "فريق العمل"
           suspended: "المعلَّقون"
           staged: "مؤقت"
         approved: "تمت الموافقة عليه؟"
@@ -4361,7 +4350,7 @@ ar:
           member: "المستخدمون في مستوى الثقة 2 (عضو)"
           regular: "المستخدمون في مستوى الثقة 3 (منتظم)"
           leader: "المستخدمون في مستوى الثقة 4 (قائد)"
-          staff: "طاقم العمل"
+          staff: "فريق العمل"
           admins: "المستخدمون المسؤولون"
           moderators: "المشرفون"
           suspended: "المستخدمون المعلَّقون"
@@ -4433,7 +4422,7 @@ ar:
         approve_bulk_success: "تم بنجاح! لقد تمت الموافقة على جميع الأعضاء المحدَّدين وإرسال إشعارات إليهم."
         time_read: "وقت القراءة"
         anonymize: "إخفاء هوية المستخدم"
-        anonymize_confirm: "هل تريد بالتأكيد إخفاء هوية هذا الحساب؟ سيؤدي ذلك إلى تغيير اسم المستخدم والبريد الإلكتروني، وإعادة تعيين جميع معلومات الملف الشخصي."
+        anonymize_confirm: "هل تريد بالتأكيد إخفاء هوية هذا الحساب؟ سيؤدي ذلك إلى تغيير اسم المستخدم والبريد الإلكتروني، وإعادة ضبط جميع معلومات الملف الشخصي."
         anonymize_yes: "نعم، إخفاء هوية هذا الحساب"
         anonymize_failed: "حدثت مشكلة في أثناء إخفاء هوية الحساب."
         delete: "حذف المستخدم"
@@ -4481,19 +4470,19 @@ ar:
         deactivate_failed: "حدثت مشكلة في أثناء إلغاء تفعيل المستخدم."
         unsilence_failed: "حدثت مشكلة في أثناء إلغاء كتم المستخدم."
         silence_failed: "حدثت مشكلة في أثناء كتم المستخدم."
-        silence_confirm: "هل تريد بالتأكيد كتم هذا المستخدم؟ لن يتمكَّن من إنشاء أي موضوعات أو منشورات."
+        silence_confirm: "هل تريد بالتأكيد كتم هذا المستخدم؟ لن يتمكن من إنشاء أي موضوعات أو منشورات."
         silence_accept: "نعم، كتم هذا المستخدم"
-        bounce_score: "سجل الارتداد"
+        bounce_score: "نقاط الارتداد"
         reset_bounce_score:
-          label: "إعادة التعيين"
-          title: "إعادة تعيين سجل الارتداد إلى 0"
+          label: "إعادة الضبط"
+          title: "إعادة ضبط نقاط الارتداد على 0"
         visit_profile: "قم بزيارة <a href='%{url}'>صفحة تفضيلات هذا المستخدم</a> لتعديل ملفه الشخصي"
         deactivate_explanation: "يجب على المستخدم غير النشط إعادة التحقُّق من صحة بريده الإلكتروني"
         suspended_explanation: "لا يمكن للمستخدم المعلَّق تسجيل الدخول."
         silence_explanation: "لا يمكن للمستخدم المكتوم إنشاء منشورات أو موضوعات."
         staged_explanation: "لا يمكن للمستخدم المؤقت النشر إلا عن طريق البريد الإلكتروني في موضوعات محدَّدة."
         bounce_score_explanation:
-          none: "لم يتم استلام أي رسائل مرتدة مؤخرًا من هذا البريد الالكتروني"
+          none: "لم يتم استلام أي رسائل مرتدة مؤخرًا من هذا البريد الالكتروني."
           some: "تم استلام بعض الرسائل المرتدة مؤخرًا من هذا البريد الإلكتروني."
           threshold_reached: "تم استلام عدد كبير جدًا من الرسائل المرتدة من هذا البريد الإلكتروني."
         trust_level_change_failed: "حدثت مشكلة في أثناء تغيير مستوى ثقة المستخدم."
@@ -4501,9 +4490,9 @@ ar:
         trust_level_2_users: "المستخدمون من مستوى الثقة 2."
         trust_level_3_requirements: "متطلبات مستوى الثقة 3"
         trust_level_locked_tip: "مستوى الثقة مقفل، لن يرقِّي النظام المستخدم أو يخفض رتبته"
-        trust_level_unlocked_tip: "مستوى الثقة مفتوح، قد يرقِّي النظام المستخدم أو يخفض رتبته"
+        trust_level_unlocked_tip: "تم إلغاء قفل مستوى الثقة، قد يرقِّي النظام المستخدم أو يخفض رتبته"
         lock_trust_level: "قفل مستوى الثقة"
-        unlock_trust_level: "فتح مستوى الثقة"
+        unlock_trust_level: "إلغاء قفل مستوى الثقة"
         tl3_requirements:
           title: "المتطلبات لمستوى الثقة 3."
           table_title:
@@ -4587,7 +4576,7 @@ ar:
         show_overriden: "إظهار التجاوزات فقط"
       settings:
         show_overriden: "إظهار التجاوزات فقط"
-        reset: "إعادة التعيين"
+        reset: "إعادة الضبط"
         none: "لا يوجد"
       site_settings:
         title: "الإعدادات"
@@ -4658,7 +4647,7 @@ ar:
         grant: منح
         no_user_badges: "لم يتم منح %{name} أي شارة."
         no_badges: لا توجد شارات يمكن منحها.
-        none_selected: "اختيار شارة للبدء"
+        none_selected: "تحديد شارة للبدء"
         allow_title: السماح للمستخدمين باستخدام الشارة كعنوان
         multiple_grant: يمكن منحها عدة مرات
         listable: عرض الشارة في صفحة الشارات العامة
@@ -4685,7 +4674,7 @@ ar:
           error_help: "راجِع الروابط التالية للحصول على المساعدة في عمليات استعلام الشارات."
           bad_count_warning:
             header: "<b>تحذير</b>!"
-            text: "بعض عينات المنح مفقودة. يحدث ذلك عندما يُعيد استعلام الشارات مُعرِّفات مستخدمين أو مُعرِّفات منشورات غير موجودة. قد يتسبَّب ذلك في نتائج غير متوقعة لاحقًا. يُرجى التحقُّق من صحة الاستعلام."
+            text: "بعض نماذج المنح مفقودة. يحدث ذلك عندما يعرض استعلام الشارات مُعرِّفات مستخدمين أو مُعرِّفات منشورات غير موجودة. قد يتسبَّب ذلك في نتائج غير متوقعة لاحقًا. يُرجى التحقُّق من صحة الاستعلام."
           no_grant_count: "لا توجد شارات ليتم تخصيصها."
           grant_count:
             zero: "<b>%{count}</b> شارة بانتظار التخصيص."
@@ -4704,10 +4693,9 @@ ar:
           what_are_badges_title: "ما الشارات؟"
           badge_query_examples_title: "أمثلة على استعلامات الشارات"
         mass_award:
-          no_badge_selected: يُرجى اختيار شارة للبدء.
+          no_badge_selected: يُرجى تحديد شارة للبدء.
           upload_csv: تحميل ملف CSV يتضمَّن عناوين البريد الإلكتروني للمستخدمين أو أسماء المستخدمين
           aborted: يُرجى تحميل ملف CSV يتضمَّن عناوين البريد الإلكتروني للمستخدمين أو أسماء المستخدمين
-          success: تم استلام ملف CSV وسيتلقَّى المستخدمون الشارة قريبًا.
           replace_owners: إزالة الشارة من مالكيها السابقين
       emoji:
         title: "الرمز التعبيري"
@@ -4776,15 +4764,15 @@ ar:
       upload_error: "عذرًا، حدث خطأ في أثناء تحميل هذا الملف. يُرجى إعادة المحاولة."
       quit: "ربما لاحقًا"
       staff_count:
-        zero: "يضم مجتمعك %{count} عضو في طاقم العمل."
-        one: "يضم مجتمعك عضوًا واحدًا (%{count}) في طاقم العمل (أنت)."
-        two: "يضم مجتمعك عضوَين (%{count}) في طاقم العمل، بما فيهما أنت."
-        few: "يضم مجتمعك %{count} أعضاء في طاقم العمل، بما فيهم أنت."
-        many: "يضم مجتمعك %{count} عضوًا في طاقم العمل، بما فيهم أنت."
-        other: "يضم مجتمعك %{count} عضو في طاقم العمل، بما فيهم أنت."
+        zero: "يضم مجتمعك %{count} عضو في فريق العمل."
+        one: "يضم مجتمعك عضوًا واحدًا (%{count}) في فريق العمل (أنت)."
+        two: "يضم مجتمعك عضوَين (%{count}) في فريق العمل، بما فيهما أنت."
+        few: "يضم مجتمعك %{count} أعضاء في فريق العمل، بما فيهم أنت."
+        many: "يضم مجتمعك %{count} عضوًا في فريق العمل، بما فيهم أنت."
+        other: "يضم مجتمعك %{count} عضو في فريق العمل، بما فيهم أنت."
       invites:
         add_user: "إضافة"
-        none_added: "لم تُرسِل دعوة إلى أي عضو في طاقم العمل. هل تريد بالتأكيد المتابعة؟"
+        none_added: "لم تُرسِل دعوة إلى أي عضو في فريق العمل. هل تريد بالتأكيد المتابعة؟"
         roles:
           admin: "مسؤول"
           moderator: "مشرف"
diff --git a/config/locales/client.be.yml b/config/locales/client.be.yml
index 1ef6d90008..dd5ed0f70b 100644
--- a/config/locales/client.be.yml
+++ b/config/locales/client.be.yml
@@ -116,7 +116,6 @@ be:
     rules: "Правілы"
     mobile_view: "Выгляд для мабільнага"
     desktop_view: "Выгляд для настольнага кампутара"
-    you: "Вы"
     or: "або"
     now: "толькі што"
     read_more: "чытаць далей"
@@ -378,6 +377,8 @@ be:
           title: "Cачыць"
         muted:
           title: "ігнараваць"
+      default_notifications:
+        modal_yes: "Так"
     user_action_groups:
       "1": "упадабаныя"
       "2": "атрыманыя перавагі"
@@ -403,7 +404,6 @@ be:
       posts: "Паведамленні"
       topics: "Тэмы"
       latest: "Апошнія"
-      toggle_ordering: "паказаць"
       subcategories: "Падкатэгорыі"
       topic_stat_unit:
         week: "тыдзень"
@@ -568,7 +568,6 @@ be:
         details: "дэталі"
         log_out_all: "Выйсці паўсюль"
       last_posted: "Апошняе паведамленне"
-      last_emailed: "Апошні электронны ліст"
       last_seen: "заўважаны апошні раз"
       created: "Далучыўся (лася)"
       log_out: "Выйсці"
@@ -1085,8 +1084,6 @@ be:
       errors:
         upload: "Выбачайце, пры загрузцы гэтага файла адбылася памылка. Калі ласка, паспрабуйце яшчэ раз."
         upload_not_authorized: "Sorry, the file you are trying to upload is not authorized (authorized extensions: %{authorized_extensions})."
-      archetypes:
-        save: "Захаваць налады"
       controls:
         like: "упадабаць гэты пост"
         edit_action: "Рэдагаваць"
@@ -1118,8 +1115,8 @@ be:
       bookmarks:
         created: "створаны"
         name: "Імя"
+        options: "Налады"
     category:
-      can: "можа&hellip;"
       none: "(па-за катэгорыямі)"
       all: "Усе катэгорыі"
       choose: "Абраць"
@@ -1136,7 +1133,6 @@ be:
       save_error: У выпадку захавання катэгорыі адбылася памылка.
       name: "Назва катэгорыі"
       description: "апісанне"
-      topic: "тэма катэгорыі"
       badge_colors: "колеру значка"
       background_color: "колер фону"
       foreground_color: "колер тэксту"
diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml
index c885ae41ef..0f67bbe14c 100644
--- a/config/locales/client.bg.yml
+++ b/config/locales/client.bg.yml
@@ -41,6 +41,7 @@ bg:
       long_date_without_year_with_linebreak: "MMM D <br/>LT"
       long_date_with_year_with_linebreak: "MMM D, 'YY <br/>LT"
       wrap_ago: "преди %{date}"
+      wrap_on: "на %{date}"
       tiny:
         half_a_minute: "< 1 мин."
         less_than_x_seconds:
@@ -119,6 +120,10 @@ bg:
       topic_html: 'Тема: <span class="topic-title">%{topicTitle}</span>'
       post: "публикации #%{postNumber}"
       close: "затвори"
+      twitter: "Споделете в Twitter"
+      facebook: "Споделете във Facebook"
+      email: "Изпратете чрез имейл"
+      url: "Копирайте и споделете линка"
     action_codes:
       public_topic: "направи тази тема публична на %{when}"
       private_topic: "направи тази тема персонално съобщение%{when}"
@@ -128,6 +133,7 @@ bg:
       user_left: "%{who}напусна чата %{when}"
       removed_user: "изтри %{who} %{when}"
       removed_group: "изтри %{who} на %{when}"
+      autobumped: "автоматично вдигната %{when}"
       autoclosed:
         enabled: "затворена %{when}"
         disabled: "отворена %{when}"
@@ -154,6 +160,7 @@ bg:
     wizard_required: "Добре дошли във вашия нов Discourse! Нека започнем с <a href='%{url}' data-auto-route='true'>съветника за настройка</a> ✨"
     emails_are_disabled: "Всички изходящи имейли са изцяло забранени от администратора. Няма да бъдат изпращани никакви имейл известия."
     software_update_prompt:
+      message: "Актуализирахме този сайт, <span>моля, презаредете</span>, или може да изпитате неочаквано поведение."
       dismiss: "Отмени"
     bootstrap_mode_disabled: "Режимът на стартиране ще бъде изключен в следващите 24 часа. "
     themes:
@@ -163,6 +170,7 @@ bg:
       regions:
         ap_northeast_1: "Азия (Токио)"
         ap_northeast_2: "Азия (Сеул)"
+        ap_east_1: "Азия (Хонг Конг)"
         ap_south_1: "Азия (Мумбай)"
         ap_southeast_1: "Азия (Сингапур)"
         ap_southeast_2: "Океания (Сидни)"
@@ -181,6 +189,7 @@ bg:
         us_gov_west_1: "AWS GovCloud (US-West)"
         us_west_1: "US West (С. Калифорния)"
         us_west_2: "US West (Орегон)"
+    clear_input: "Изчистване на полето"
     edit: "редактирайте заглавието и категорията на тази тема"
     expand: "Разшири"
     not_implemented: "Тази функционалност все още не е добавена."
@@ -209,7 +218,6 @@ bg:
     conduct: "Правила за поведение"
     mobile_view: "Мобилен изглед"
     desktop_view: "Десктоп изглед"
-    you: "Вие"
     or: "или"
     now: "преди малко"
     read_more: "прочетете повече"
@@ -240,6 +248,9 @@ bg:
       moderators: "Модератори"
       stat:
         all_time: "От началото"
+        last_day: "Последните 24 часа"
+        last_7_days: "Последните 7 дни"
+        last_30_days: "Последните 30 дни"
       like_count: "Харесвания"
       topic_count: "Теми"
       post_count: "Публикации"
@@ -249,6 +260,7 @@ bg:
       contact_info: "В случай на критичен или спешен въпрос засягащ този сайт, моля свържете се с нас на адрес %{contact_email}."
     bookmarked:
       title: "Отметка"
+      edit_bookmark: "Редактиране на отметка"
       clear_bookmarks: "Изчисти отметките"
       help:
         bookmark: "Щракнете за да добавите в отметки първата публикация в тази тема"
@@ -264,18 +276,23 @@ bg:
       invalid_custom_datetime: "Въведените дата и час не са валидни. Опитайте отново."
       list_permission_denied: "Нямате право да преглеждате отметките на този потребител."
       auto_delete_preference:
+        label: "Автоматично изтриване"
         never: "Никога"
       search: "Търсене"
       reminders:
         today_with_time: "днес в %{time}"
         tomorrow_with_time: "утре в %{time}"
         at_time: "на %{date_time}"
+    copy_codeblock:
+      copied: "копирано!"
     drafts:
       resume: "Продължи"
       remove: "Премахване"
       new_topic: "Проект на нова тема"
-      new_private_message: "Чернова на лично съобщение"
       topic_reply: "Проект на отговор"
+      abandon:
+        yes_value: "Отхвърляне"
+        no_value: "Възобновете редактирането"
     topic_count_unread:
       one: "Виж %{count} непрочетена тема"
       other: "Виж %{count} непрочетени теми"
@@ -284,6 +301,7 @@ bg:
       other: "Вижте %{count} нови теми"
     preview: "преглед"
     cancel: "прекрати"
+    deleting: "Изтриване..."
     save: "Запазете промените"
     saving: "Запазва се..."
     saved: "Запазено!"
@@ -334,7 +352,10 @@ bg:
       title: "Преглед"
       topic: "Тема:"
       filtered_user: "Потребител"
+      filtered_reviewed_by: "Прегледано от"
       show_all_topics: "покажи всички теми"
+      deleted_post: "(публикацията е изтрита)"
+      deleted_user: "(потребителят е изтрит)"
       user:
         bio: "Биография"
         website: "Уебсайт"
@@ -356,6 +377,7 @@ bg:
       topics:
         topic: "Тема"
         reviewable_count: "Брой"
+        reported_by: "Докладвано от"
         details: "детайли"
         unique_users:
           one: "%{count} потребител"
@@ -548,8 +570,6 @@ bg:
         public: "Публични"
         private: "Затворени"
         public_groups: "Публични групи"
-        automatic_group: Автоматична група
-        close_group: Затворете групата
         my_groups: "Моите групи"
         group_type: "Тип група"
         is_group_user: "Член"
@@ -602,6 +622,8 @@ bg:
       flair_color_placeholder: "(По желание) Шестнадесетична стойност на цвят"
       flair_preview_icon: "Икона за прегледа"
       flair_preview_image: "Снимка за преглед"
+      default_notifications:
+        modal_yes: "Да"
     user_action_groups:
       "1": "Дадени харесвания"
       "2": "Получени харесвания"
@@ -631,7 +653,6 @@ bg:
       posts: "Публикации"
       topics: "Теми"
       latest: "Последни"
-      toggle_ordering: "включете контрол на подредбата"
       subcategories: "Подкатегории"
       topic_sentence:
         one: "%{count} тема"
@@ -895,7 +916,6 @@ bg:
       auth_tokens:
         details: "Детайли "
       last_posted: "Последна публикация"
-      last_emailed: "Последен имейл"
       last_seen: "Видян"
       created: "Присъединен"
       log_out: "Изход"
@@ -1697,8 +1717,6 @@ bg:
       whisper: "този пост е отбелязан като таен за модераторите"
       wiki:
         about: "този пост е wiki"
-      archetypes:
-        save: "Запазете опциите"
       few_likes_left: "Благодарим за споделянето на любовта Ви! Вие имате право на само още няколко харесвания за днес."
       controls:
         reply: "започни отговор на тази публикация"
@@ -1780,6 +1798,7 @@ bg:
         name: "Име"
         name_placeholder: "За какво е тази отметка?"
         set_reminder: "Напомни ми"
+        options: "Опции"
         actions:
           delete_bookmark:
             name: "Изтриване на отметка"
@@ -1787,7 +1806,6 @@ bg:
           edit_bookmark:
             name: "Редактиране на отметка"
     category:
-      can: "can&hellip;"
       none: "(без категория)"
       all: "Всички категории"
       edit: "Редактирай"
@@ -1808,7 +1826,6 @@ bg:
       save_error: Възникна грешка при запазването на категорията.
       name: "Име на категорията"
       description: "Описание"
-      topic: "предмет на категорията"
       logo: "Изображение за категория "
       background_image: "Изображение за фон на категорията "
       badge_colors: "Цветове на значките"
@@ -2957,6 +2974,8 @@ bg:
         badge_intro:
           title: "Изберете съществуваща значка или създайте нова, за да започнете"
           what_are_badges_title: "Какво са значките?"
+        mass_award:
+          csv_has_unmatched_users: "Следните записи са в CSV файла, но те не могат да бъдат съчетани със съществуващи потребители и следователно няма да получат значката:"
       emoji:
         title: "Емотикони "
         help: "Добави нови емотикони, които ще бъдат достъпни до всички. (Съвет: Може да дръпнете и пуснете много файлове наведнъж). "
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index e866c527d9..ccc58a0081 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -236,7 +236,6 @@ bs_BA:
     conduct: "Kodeks ponašanja"
     mobile_view: "Mobilni prikaz"
     desktop_view: "Desktop prikaz"
-    you: "Vi"
     or: "ili"
     now: "upravo sada"
     read_more: "pročitaj više"
@@ -314,7 +313,6 @@ bs_BA:
       resume: "Nastavi"
       remove: "Ukloni"
       new_topic: "Nacrt nove teme"
-      new_private_message: "Nova skica privatne poruke"
       topic_reply: "skica odgovora"
       abandon:
         yes_value: "Odbaci"
@@ -715,8 +713,6 @@ bs_BA:
         public: "Javno"
         private: "Privatno"
         public_groups: "Javne grupe"
-        automatic_group: Automatske grupe
-        close_group: Zatvorene grupe
         my_groups: "Moje grupe"
         group_type: "Tip grupe"
         is_group_user: "Član"
@@ -779,6 +775,8 @@ bs_BA:
       flair_type:
         icon: "Odaberi ikonu"
         image: "Učitaj sliku"
+      default_notifications:
+        modal_yes: "Da"
     user_action_groups:
       "1": "Lajkovi"
       "2": "Dobijeni Lajkovi"
@@ -808,7 +806,6 @@ bs_BA:
       posts: "Odgovori"
       topics: "Teme"
       latest: "Zadnje"
-      toggle_ordering: "toggle ordering control"
       subcategories: "Podkategorije"
       muted: "Prigušene kategorije"
       topic_sentence:
@@ -1200,7 +1197,6 @@ bs_BA:
         secure_account: "zaštiti moj račun"
         latest_post: "Poslednji ste objavili ..."
       last_posted: "Posljednja objava"
-      last_emailed: "Posljednji mejlovan"
       last_seen: "Viđen"
       created: "Registrovan"
       log_out: "Odjavi se"
@@ -2390,8 +2386,6 @@ bs_BA:
       whisper: "ova objava je privatni šapat za moderatore "
       wiki:
         about: "ova objava je wiki"
-      archetypes:
-        save: "Save Options"
       few_likes_left: "Hvala za dijeljenje ljubavi! Za danas vam je ostalo samo nekoliko lajkova."
       controls:
         reply: "počni da sastavljaš odgovor na ovaj post"
@@ -2502,6 +2496,7 @@ bs_BA:
         name: "Ime"
         name_placeholder: "Za što služi ova zabilješka?"
         set_reminder: "Podsjeti me"
+        options: "Opcije"
         actions:
           delete_bookmark:
             name: "Obriši zabilješku"
@@ -2510,7 +2505,6 @@ bs_BA:
             name: "Izmijeni zabilješku"
             description: "Izmjena naziva zabilješke ili promjena datuma i vremena podsjetnika"
     category:
-      can: "can&hellip; "
       none: "(no category)"
       all: "Sve kategorije"
       choose: "kategorij i pomoć"
@@ -2537,7 +2531,6 @@ bs_BA:
       save_error: There was an error saving the category.
       name: "Category Name"
       description: "Description"
-      topic: "category topic"
       logo: "Category Logo Image"
       background_image: "Category Background Image"
       badge_colors: "Badge colors"
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index a23ebc138f..6bb48e87a4 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -213,7 +213,6 @@ ca:
     conduct: "Codi de Conducta"
     mobile_view: "Vista mòbil"
     desktop_view: "Vista d'escriptori"
-    you: "Vós"
     or: "o"
     now: "ara mateix"
     read_more: "llegeix més"
@@ -284,7 +283,6 @@ ca:
       resume: "Reprèn"
       remove: "Elimina"
       new_topic: "Esborrany de tema nou"
-      new_private_message: "Esborrany de nou missatge privat"
       topic_reply: "Esborrany de resposta"
       abandon:
         yes_value: "Descarta"
@@ -654,8 +652,6 @@ ca:
         public: "Públic"
         private: "Privat"
         public_groups: "Grups públics"
-        automatic_group: Grup automàtic
-        close_group: Tanca el grup
         my_groups: "Els meus grups"
         group_type: "Tipus de grup"
         is_group_user: "Membre"
@@ -713,6 +709,10 @@ ca:
       flair_color_placeholder: "(Opcional) Valor de color hexadecimal"
       flair_preview_icon: "Previsualitza la icona"
       flair_preview_image: "Previsualitza la imatge"
+      default_notifications:
+        modal_description: "Voleu aplicar històricament aquest canvi? Això canviarà les preferències per a %{count} usuaris existents."
+        modal_yes: "Sí"
+        modal_no: "No, aplica el canvi només en el futur"
     user_action_groups:
       "1": "'M'agrada'"
       "2": "'M'agrada'"
@@ -742,7 +742,6 @@ ca:
       posts: "Publicacions"
       topics: "Temes"
       latest: "Més recents"
-      toggle_ordering: "commuta el control de l'ordre"
       subcategories: "Subcategories"
       topic_sentence:
         one: "%{count} tema"
@@ -1098,7 +1097,6 @@ ca:
         secure_account: "Fes segur el meu compte"
         latest_post: "L'última cosa que heu publicat..."
       last_posted: "Darrer missatge"
-      last_emailed: "Darrer correu"
       last_seen: "Vist"
       created: "Registrat"
       log_out: "Tanca la sessió"
@@ -2238,8 +2236,6 @@ ca:
       whisper: "aquesta publicació és un xiuxiueig privat per a moderadors"
       wiki:
         about: "aquesta publicació és una wiki"
-      archetypes:
-        save: "Desa opcions"
       few_likes_left: "Gràcies per compartir l'amor! Us queden uns quants 'm'agrada' per donar avui."
       controls:
         reply: "comença a redactar una resposta a aquesta publicació"
@@ -2340,8 +2336,8 @@ ca:
         created: "Creat"
         updated: "Actualitzat"
         name: "Nom"
+        options: "Opcions"
     category:
-      can: "pot&hellip; "
       none: "(sense categoria)"
       all: "Totes les categories"
       choose: "categoria&hellip;"
@@ -2372,7 +2368,6 @@ ca:
       save_error: Hi ha hagut un error en desar la categoria.
       name: "Nom de la categoria"
       description: "Descripció"
-      topic: "tema de la categoria"
       logo: "Imatge del logo de la categoria"
       background_image: "Imatge de fons de la categoria"
       badge_colors: "Colors d'insígnies"
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index 6ccb34878f..3555e6385f 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -261,7 +261,6 @@ cs:
     conduct: "Kodex chování"
     mobile_view: "Mobilní verze"
     desktop_view: "Plná verze"
-    you: "Vy"
     or: "nebo"
     now: "právě teď"
     read_more: "číst dále"
@@ -344,7 +343,6 @@ cs:
       remove: "Odstranit"
       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:
         yes_value: "Zahodit"
@@ -647,8 +645,6 @@ cs:
         public: "Veřejné"
         private: "Soukromé"
         public_groups: "Veřejné skupiny"
-        automatic_group: Automatická skupina
-        close_group: Zavřít skupinu
         my_groups: "Moje skupiny"
         group_type: "Typ skupiny"
         is_group_user: "Člen"
@@ -727,6 +723,8 @@ cs:
       flair_type:
         icon: "Vyberte ikonu"
         image: "Nahrát obrázek"
+      default_notifications:
+        modal_yes: "Ano"
     user_action_groups:
       "1": "Rozdaných 'líbí se'"
       "2": "Obdržených 'líbí se'"
@@ -756,7 +754,6 @@ cs:
       posts: "Příspěvky"
       topics: "Témata"
       latest: "Aktuální"
-      toggle_ordering: "Přepnout editaci pořadí"
       subcategories: "Podkategorie"
       muted: "Ztlumené kategorie"
       topic_sentence:
@@ -1118,7 +1115,6 @@ cs:
         was_this_you: "Byla to vaše návštěva?"
         browser_and_device: "%{browser} na %{device}"
       last_posted: "Poslední příspěvek"
-      last_emailed: "Email naposledy zaslán"
       last_seen: "Naposledy viděn"
       created: "Účet vytvořen"
       log_out: "Odhlásit se"
@@ -2215,8 +2211,6 @@ cs:
       whisper: "tento příspěvek je soukromé šeptání pro moderátory"
       wiki:
         about: "toto je wiki příspěvek"
-      archetypes:
-        save: "Uložit nastavení"
       few_likes_left: "Díky za šíření lásky! Zbývá ti pro dnešek už jen několik málo lajků."
       controls:
         reply: "otevře okno pro sepsání odpovědi na tento příspěvek"
@@ -2324,8 +2318,8 @@ cs:
       bookmarks:
         created: "Vytvořený"
         name: "Jméno"
+        options: "Možnosti"
     category:
-      can: "smí&hellip; "
       none: "(bez kategorie)"
       all: "Všechny kategorie"
       choose: "kategorie&hellip;"
@@ -2348,7 +2342,6 @@ cs:
       save_error: Během ukládání kategorie nastala chyba.
       name: "Název kategorie"
       description: "Popis"
-      topic: "téma kategorie"
       logo: "Logo kategorie"
       background_image: "Obrázek na pozadí této kategorie"
       badge_colors: "Barvy štítku"
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index 6d4389e5fc..34fa7197bc 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -220,7 +220,6 @@ da:
     conduct: "Adfærdskodeks"
     mobile_view: "Mobil visning"
     desktop_view: "Computervisning"
-    you: "Dig"
     or: "eller"
     now: "lige nu"
     read_more: "læs mere"
@@ -302,7 +301,6 @@ da:
       remove: "Fjern"
       remove_confirmation: "Er du sikker på, at du vil offentliggøre dette udkast?"
       new_topic: "Nyt emne-kladde"
-      new_private_message: "Ny kladde til privat besked"
       topic_reply: "Udkast til svar"
       abandon:
         confirm: "Du har et udkast i gang for dette emne. Hvad vil du gerne gøre med den?"
@@ -376,7 +374,6 @@ da:
         type_bonus:
           name: "skriv bonus"
           title: "Visse gennemgåelige typer kan tildeles en bonus af medarbejdere, for at give dem til en højere prioritet."
-      stale_help: "Denne gennemgang er blevet løst af en anden."
       claim_help:
         optional: "Du kan gøre krav på dette punkt, for at forhindre andre i at gennemgå det."
         required: "Du skal kræve punkter, før du kan gennemgå dem."
@@ -733,8 +730,6 @@ da:
         public: "Offentlig"
         private: "Privat"
         public_groups: "Offentlige Grupper"
-        automatic_group: Automatisk Gruppe
-        close_group: Luk Gruppe
         my_groups: "Mine Grupper"
         group_type: "Gruppe type"
         is_group_user: "Bruger"
@@ -811,6 +806,11 @@ da:
       flair_type:
         icon: "Vælg et ikon"
         image: "Overfør et billede"
+      default_notifications:
+        modal_title: "Bruger standard notifikationer"
+        modal_description: "Ønsker du at anvende denne ændring historisk? Dette vil ændre præferencer for %{count} eksisterende brugere."
+        modal_yes: "Ja"
+        modal_no: "Nej, anvend kun ændringer fremadrettet"
     user_action_groups:
       "1": "Synes godt om"
       "2": "Syntes godt om"
@@ -840,7 +840,6 @@ da:
       posts: "Indlæg"
       topics: "Emner"
       latest: "Seneste"
-      toggle_ordering: "vis/skjul rækkefølgeskifter"
       subcategories: "Underkategorier:"
       muted: "Lydløse kategorier"
       topic_sentence:
@@ -1291,7 +1290,6 @@ da:
         browser_active: '%{browser} | <span class="active">aktiv nu</span>'
         browser_last_seen: "%{browser} | %{date}"
       last_posted: "Sidste indlæg"
-      last_emailed: "Sidste e-mail"
       last_seen: "Sidst set"
       created: "Oprettet"
       log_out: "Log ud"
@@ -1926,7 +1924,6 @@ da:
           confirm: Du har gemt et nyt emneudkast, som overskrives, hvis du opretter et sammenkædet emne.
         reply_as_new_group_message:
           label: Svar som ny gruppemeddelelse
-          desc: Opret en ny privat besked med de samme modtagere
         reply_as_private_message:
           label: Ny meddelelse
           desc: Opret en ny privat besked
@@ -2211,13 +2208,6 @@ da:
       defer:
         help: "Markér som ulæst"
         title: "Udsæt"
-      feature_on_profile:
-        help: "Tilføj et link til dette emne på dit brugerkort og profil"
-        title: "Fremhæv på Profil"
-      remove_from_profile:
-        warning: "Din profil har allerede et fremhævet emne. Hvis du fortsætter, vil dette emne erstatte det eksisterende emne."
-        help: "Fjern linket til dette emne på din brugerprofil"
-        title: "Fjern fra profil"
       list: "Emner"
       new: "nyt emne"
       unread: "ulæste"
@@ -2686,8 +2676,6 @@ da:
       whisper: "dette indlæg er en privat hvisken for moderatorer"
       wiki:
         about: "indlægget er en wiki"
-      archetypes:
-        save: "Gem indstillinger"
       few_likes_left: "Tak fordi du spreder kærligheden! Du har kun få 'Synes godt om' tilbage i dag."
       controls:
         reply: "begynd at skrive et svar til dette indlæg"
@@ -2809,6 +2797,7 @@ da:
         name: "Navn"
         name_placeholder: "Hvad er dette bogmærke til?"
         set_reminder: "Påmind mig"
+        options: "Indstillinger"
         actions:
           delete_bookmark:
             name: "Slet bogmærke"
@@ -2829,7 +2818,6 @@ da:
         post_number: "%{username}, indlæg #%{post_number}"
         show_all: "Vis alle"
     category:
-      can: "kan&hellip; "
       none: "(ingen kategori)"
       all: "Alle kategorier"
       choose: "kategori&hellip;"
@@ -2863,7 +2851,6 @@ da:
       save_error: Der opstod en fejl da kategorien skulle gemmes.
       name: "Kategorinavn"
       description: "Beskrivelse"
-      topic: "kategoriemne"
       logo: "Kategori logo billede"
       background_image: "Kategori logo baggrundsbillede"
       badge_colors: "Emblem farver"
@@ -4848,8 +4835,10 @@ da:
           perform: "Tildel Emblem til Brugere"
           upload_csv: Overfør en CSV-fil med enten bruger-e-mails eller brugernavne
           aborted: Overfør venligst en CSV-fil, der indeholder enten bruger-e-mails eller brugernavne
-          success: Din CSV-fil blev modtaget, og brugerne vil modtage deres emblem om kort tid.
+          csv_has_unmatched_users: "Følgende poster er i CSV-filen, men de kunne ikke matches med eksisterende brugere, og vil derfor ikke modtage emblemet:"
+          csv_has_unmatched_users_truncated_list: "Der var %{count} poster i CSV-filen, der ikke kunne matches med eksisterende brugere og modtager derfor ikke emblemet. På grund af det store antal umatchede poster vises kun de første 100:"
           replace_owners: Fjern emblemet fra tidligere ejere
+          grant_existing_holders: Tildel yderligere emblemer til eksisterende emblemindehavere
       emoji:
         title: "Humørikon"
         help: "Tilføj en ny emoji, som vil være tilgængelig for alle. (PROTIP: drag & drop flere filer på én gang)"
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 524d9e045d..5b046a4630 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -221,7 +221,6 @@ de:
     conduct: "Verhaltenskodex"
     mobile_view: "Mobile Ansicht"
     desktop_view: "Desktop-Ansicht"
-    you: "Du"
     or: "oder"
     now: "gerade eben"
     read_more: "weiterlesen"
@@ -306,7 +305,6 @@ de:
       remove: "Entfernen"
       remove_confirmation: "Bist du sicher, dass du diesen Entwurf löschen möchtest?"
       new_topic: "Neuer Entwurf für Thema"
-      new_private_message: "Neuer Entwurf für private 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?"
@@ -380,7 +378,6 @@ de:
         type_bonus:
           name: "Bonustyp"
           title: "Bestimmte überprüfbare Typen können vom Team mit einem Bonus ausgestattet werden, damit sie höher priorisiert sind."
-      stale_help: "Dieses überprüfbare Element wurde von einer anderen Person bearbeitet."
       claim_help:
         optional: "Du kannst dieses Element reservieren, damit andere es nicht überprüfen."
         required: "Du musst Elemente reservieren, bevor du sie überprüfen kannst."
@@ -753,8 +750,6 @@ de:
         public: "Öffentlich"
         private: "Privat"
         public_groups: "Öffentliche Gruppen"
-        automatic_group: Automatische Gruppe
-        close_group: Gruppe schließen
         my_groups: "Meine Gruppen"
         group_type: "Art der Gruppe"
         is_group_user: "Mitglied"
@@ -860,7 +855,6 @@ de:
       posts: "Beiträge"
       topics: "Themen"
       latest: "Aktuelle"
-      toggle_ordering: "Reihenfolge ändern"
       subcategories: "Unterkategorien"
       muted: "Stummgeschaltete Kategorien"
       topic_sentence:
@@ -1313,7 +1307,6 @@ de:
         browser_active: '%{browser} | <span class="active">gerade aktiv</span>'
         browser_last_seen: "%{browser} | %{date}"
       last_posted: "Letzter Beitrag"
-      last_emailed: "Letzte E-Mail"
       last_seen: "Zuletzt gesehen"
       created: "Beigetreten"
       log_out: "Abmelden"
@@ -1956,7 +1949,6 @@ de:
           confirm: Du hast einen neuen Themen-Entwurf gespeichert. Wenn du ein verknüpftes Thema erstellst, wird er überschrieben.
         reply_as_new_group_message:
           label: Als neue Gruppen-Nachricht antworten
-          desc: Erstelle eine neue private Nachricht mit denselben Empfängern
         reply_as_private_message:
           label: Neue Nachricht
           desc: Erstelle eine neue persönliche Nachricht
@@ -2160,7 +2152,7 @@ de:
     go_back: "zurückgehen"
     not_logged_in_user: "Benutzerseite mit einer Zusammenfassung der Benutzeraktivitäten und Einstellungen"
     current_user: "zu deiner Benutzerseite gehen"
-    view_all: "Alle anzeigen %{tab}"
+    view_all: "Alle %{tab} anzeigen"
     topics:
       new_messages_marker: "letzter Besuch"
       bulk:
@@ -2251,13 +2243,6 @@ de:
       defer:
         help: "Als ungelesen markieren"
         title: "Aufschieben"
-      feature_on_profile:
-        help: "Füge eine Verknüpfung zu diesem Thema zu deiner Benutzerkarte und deinem Profil hinzu"
-        title: "Auf Profil hervorheben"
-      remove_from_profile:
-        warning: "Dein Profil hat bereits ein hervorgehobenes Thema. Wenn du fortfährst, wird dieses das bestehende Thema ersetzen."
-        help: "Entferne den Link zu diesem Thema aus deinem Benutzerprofil"
-        title: "Aus Profil entfernen"
       list: "Themen"
       new: "neues Thema"
       unread: "ungelesen"
@@ -2483,6 +2468,7 @@ de:
         pin: "Thema anheften"
         unpin: "Thema loslösen"
         pin_globally: "Thema global anheften"
+        make_banner: "Ankündigungsbanner erstellen"
         remove_banner: "Thema des Ankündigungsbanners entfernen"
       reply:
         title: "Antworten"
@@ -2736,8 +2722,6 @@ de:
       whisper: "dies ist ein privater geflüsterter Beitrag für Moderatoren"
       wiki:
         about: "dieser Beitrag ist ein Wiki"
-      archetypes:
-        save: "Speicheroptionen"
       few_likes_left: "Danke fürs Teilen der Liebe! Du hast für heute nur noch wenige „Gefällt mir“ übrig."
       controls:
         reply: "verfasse eine Antwort auf diesen Beitrag"
@@ -2879,7 +2863,6 @@ de:
         post_number: "%{username}, Beitrag #%{post_number}"
         show_all: "Alle anzeigen"
     category:
-      can: "kann &hellip; "
       none: "(keine Kategorie)"
       all: "Alle Kategorien"
       choose: "Kategorie &hellip;"
@@ -2913,7 +2896,6 @@ de:
       save_error: Beim Speichern der Kategorie ist ein Fehler aufgetreten.
       name: "Name der Kategorie"
       description: "Beschreibung"
-      topic: "Thema der Kategorie"
       logo: "Logo für Kategorie"
       background_image: "Hintergrundbild für Kategorie"
       badge_colors: "Farben des Abzeichens"
@@ -3015,8 +2997,8 @@ de:
       subcategory_list_styles:
         rows: "Zeilen"
         rows_with_featured_topics: "Zeilen mit hervorgehobenen Themen"
-        boxes: "Spalten"
-        boxes_with_featured_topics: "Spalten mit hervorgehobenen Themen"
+        boxes: "Boxen"
+        boxes_with_featured_topics: "Boxen mit hervorgehobenen Themen"
       settings_sections:
         general: "Allgemein"
         moderation: "Moderation"
@@ -4920,7 +4902,6 @@ de:
           perform: "Verleihe Abzeichen an Benutzer"
           upload_csv: Lade eine CSV-Datei mit entweder den E-Mail-Adressen oder den Benutzernamen hoch
           aborted: Bitte lade eine CSV-Datei hoch, die entweder E-Mail-Adressen oder Benutzernamen enthält
-          success: Deine CSV-Datei wurde empfangen und die Benutzer werden ihr Abzeichen in Kürze erhalten.
           replace_owners: Entferne das Abzeichen von vorherigen Eigentümern
       emoji:
         title: "Emoji"
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index 16790485e3..1ce9064d61 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -214,7 +214,6 @@ el:
     conduct: "Κώδικας δεοντολογίας"
     mobile_view: "Προβολή κινητού"
     desktop_view: "Προβολή υπολογιστή"
-    you: "Εσείς"
     or: "ή"
     now: "μόλις τώρα"
     read_more: "διαβάστε περισσότερα"
@@ -292,7 +291,6 @@ el:
       resume: "Βιογραφικό"
       remove: "Αφαίρεση"
       new_topic: "Νέο προσχέδιο θέματος"
-      new_private_message: "Νέο προσχέδιο ιδιωτικού μηνύματος"
       topic_reply: "Προσχέδιο απάντησης"
       abandon:
         yes_value: "Απόρριψη"
@@ -681,8 +679,6 @@ el:
         public: "Δημόσια"
         private: "Ιδιωτική"
         public_groups: "Δημόσιες ομάδες"
-        automatic_group: Αυτόματη Ομάδα
-        close_group: Κλείσιμο ομάδας
         my_groups: "Οι Ομάδες Μου"
         group_type: "Τύπος ομάδας"
         is_group_user: "Μέλος"
@@ -744,6 +740,10 @@ el:
       flair_type:
         icon: "Επιλέξτε ένα εικονίδιο"
         image: "Επιφορτώστε μια εικόνα"
+      default_notifications:
+        modal_description: "Θα θέλατε να εφαρμόσετε αυτήν την αλλαγή αναδρομικά; Αυτό θα αλλάξει τις προτιμήσεις για %{count} υπάρχοντες χρήστες."
+        modal_yes: "Ναι"
+        modal_no: "Όχι, εφαρμόστε την αλλαγή μόνο προς τα εμπρός"
     user_action_groups:
       "1": "Αρέσει που Έδωσα"
       "2": "Αρέσει που Έλαβα"
@@ -773,7 +773,6 @@ el:
       posts: "Αναρτήσεις"
       topics: "Νήματα"
       latest: "Πρόσφατες"
-      toggle_ordering: "εναλλαγή ταξινόμησης"
       subcategories: "Υποκατηγορίες"
       muted: "Κατηγορίες σε σίγαση"
       topic_sentence:
@@ -1170,7 +1169,6 @@ el:
         secure_account: "Ασφάλισε τον λογαριασμό μου"
         latest_post: "Τελευταία δημοσιεύσατε το…"
       last_posted: "Τελευταία Ανάρτηση"
-      last_emailed: "Τελευταίο email"
       last_seen: "Εθεάθη"
       created: "Μέλος από"
       log_out: "Αποσύνδεση"
@@ -1724,7 +1722,6 @@ el:
           confirm: Έχετε αποθηκεύσει ένα νέο προσχέδιο θέματος, το οποίο θα αντικατασταθεί εάν δημιουργήσετε ένα συνδεδεμένο θέμα.
         reply_as_new_group_message:
           label: Απάντηση ως νέο ομαδικό μήνυμα
-          desc: Δημιουργήστε ένα νέο ιδιωτικό μήνυμα με τους ίδιους παραλήπτες
         reply_as_private_message:
           label: Νέο μήνυμα
           desc: Δημιουργήστε ένα νέο προσωπικό μήνυμα
@@ -1984,13 +1981,6 @@ el:
       defer:
         help: "Σήμανση ως μη αναγνωσμένο"
         title: "Αναβολή"
-      feature_on_profile:
-        help: "Προσθέστε έναν σύνδεσμο σε αυτό το θέμα στην κάρτα χρήστη και στο προφίλ σας"
-        title: "Προτεινόμενο στο προφίλ"
-      remove_from_profile:
-        warning: "Το προφίλ σας έχει ήδη ένα προτεινόμενο θέμα. Εάν συνεχίσετε, αυτό το θέμα θα αντικαταστήσει το υπάρχον θέμα."
-        help: "Αφαιρέστε τον σύνδεσμο για αυτό το θέμα στο προφίλ χρήστη σας"
-        title: "Αφαίρεση από το προφίλ"
       list: "Νήματα"
       new: "νέο νήμα"
       unread: "αδιάβαστο"
@@ -2401,8 +2391,6 @@ el:
       whisper: "αυτή η ανάρτηση είναι εμπιστευτική προς τους συντονιστές"
       wiki:
         about: "αυτή η ανάρτηση είναι βίκι"
-      archetypes:
-        save: "Αποθήκευση Επιλογών"
       few_likes_left: "Ευχαριστούμε που μοιράστηκες την αγάπη σου! Έχεις μόνο μερικά \"μου αρέσει\" ακόμα να χρησιμοποιήσεις σήμερα."
       controls:
         reply: "απάντησε σε αυτή την ανάρτηση"
@@ -2515,6 +2503,7 @@ el:
         name: "Όνομα"
         name_placeholder: "Σε τι χρησιμεύει αυτός ο σελιδοδείκτης;"
         set_reminder: "Υπενθύμισέ μου"
+        options: "Επιλογές"
         actions:
           delete_bookmark:
             name: "Διαγραφή σελιδοδείκτη"
@@ -2523,7 +2512,6 @@ el:
             name: "Επεξεργασία σελιδοδείκτη"
             description: "Επεξεργαστείτε το όνομα του σελιδοδείκτη ή αλλάξτε την ημερομηνία και την ώρα υπενθύμισης"
     category:
-      can: "μπορεί&hellip; "
       none: "(χωρίς κατηγορία)"
       all: "Όλες οι κατηγορίες"
       choose: "κατηγορία&hellip;"
@@ -2555,7 +2543,6 @@ el:
       save_error: Παρουσιάστηκε κάποιο σφάλμα κατά την αποθήκευση της κατηγορίας.
       name: "Όνομα Κατηγορίας"
       description: "Περιγραφή"
-      topic: "νήμα κατηγορίας"
       logo: "Εικονίδιο Κατηγορίας"
       background_image: "Εικόνα Φόντου Κατηγορίας"
       badge_colors: "Χρώματα παρασήμων"
@@ -4396,7 +4383,6 @@ el:
           perform: "Απονομή σήματος στους χρήστες"
           upload_csv: Επιφορτώστε ένα CSV είτε με emails χρηστών είτε με ονόματα χρηστών
           aborted: Παρακαλώ επιφορτώστε ένα CSV που περιέχει είτε emails χρηστών είτε ονόματα χρηστών
-          success: Το CSV σας παραλήφθηκε και οι χρήστες θα λάβουν το σήμα τους σύντομα.
           replace_owners: Αφαιρέστε το σήμα από προηγούμενους κατόχους
       emoji:
         title: "Emoji"
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index 99062ef3b1..0b62f99641 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -220,7 +220,6 @@ es:
     conduct: "Código de conducta"
     mobile_view: "Versión móvil"
     desktop_view: "Versión de escritorio"
-    you: "Tú"
     or: "o"
     now: "justo ahora"
     read_more: "leer más"
@@ -305,7 +304,6 @@ es:
       remove: "Eliminar"
       remove_confirmation: "¿Seguro que quieres eliminar este borrador?"
       new_topic: "Nuevo borrador de tema"
-      new_private_message: "Nuevo borrador de mensaje privado"
       topic_reply: "Borrador de respuesta"
       abandon:
         confirm: "Tienes un borrador en curso para este tema. ¿Qué te gustaría hacer?"
@@ -379,7 +377,6 @@ es:
         type_bonus:
           name: "tipo de bonificación"
           title: "Algunos tipos revisables pueden recibir una bonificación por parte del personal para que tengan mayor prioridad."
-      stale_help: "Este elemento ha sido atendido por otra persona."
       claim_help:
         optional: "Puedes reclamar este elemento para evitar que otros lo revisen."
         required: "Debes reclamar los elementos antes de poder revisarlos."
@@ -752,8 +749,6 @@ es:
         public: "Público"
         private: "Privado"
         public_groups: "Grupos públicos"
-        automatic_group: Grupo automático
-        close_group: Cerrar grupo
         my_groups: "Mis grupos"
         group_type: "Tipo de grupo"
         is_group_user: "Miembro"
@@ -859,7 +854,6 @@ es:
       posts: "Publicaciones"
       topics: "Temas"
       latest: "Recientes"
-      toggle_ordering: "cambiar orden"
       subcategories: "Subcategorías"
       muted: "Categorías silenciadas"
       topic_sentence:
@@ -1073,7 +1067,7 @@ es:
       muted_users_instructions: "Omitir todas las notificaciones y mensajes personales de estos usuarios."
       allowed_pm_users: "Permitidos"
       allowed_pm_users_instructions: "Solo permitir mensajes personales de estos usuarios."
-      allow_private_messages_from_specific_users: "Solo permitir que ciertos usuarios que me envíen mensajes personales."
+      allow_private_messages_from_specific_users: "Solo permitir que ciertos usuarios me envíen mensajes personales."
       ignored_users: "Ignorados"
       ignored_users_instructions: "Omitir todas las publicaciones, notificaciones y mensajes personales de estos usuarios."
       tracked_topics_link: "Mostrar"
@@ -1312,7 +1306,6 @@ es:
         browser_active: '%{browser} | <span class="active">activo ahora mismo</span>'
         browser_last_seen: "%{browser} | %{date}"
       last_posted: "Última publicación"
-      last_emailed: "Último correo enviado"
       last_seen: "Última visita"
       created: "Creado el"
       log_out: "Cerrar sesión"
@@ -1815,7 +1808,7 @@ es:
       activities: Actividades
       objects: Objetos
       symbols: Símbolos
-      flags: Denuncias
+      flags: Banderas
       recent: Usados recientemente
       default_tone: Sin tono de piel
       light_tone: Tono de piel claro
@@ -1955,7 +1948,6 @@ es:
           confirm: Tienes un borrador de tema nuevo guardado. Este se sobrescribirá si creas un tema enlazado.
         reply_as_new_group_message:
           label: Responder como un nuevo mensaje de grupo
-          desc: Crear un nuevo mensaje privado con los mismos destinatarios
         reply_as_private_message:
           label: Nuevo mensaje
           desc: Crear un nuevo mensaje personal
@@ -2249,13 +2241,6 @@ es:
       defer:
         help: "Marcar como no leído"
         title: "Aplazar"
-      feature_on_profile:
-        help: "Añadir un enlace a este tema en tu tarjeta de usuario y perfil"
-        title: "Destacar en el perfil"
-      remove_from_profile:
-        warning: "Tu perfil ya tiene un tema destacado. Si continúas, este tema remplazará el tema actual."
-        help: "Eliminar el enlace a este tema de tu perfil de usuario"
-        title: "Eliminar del perfil"
       list: "Temas"
       new: "nuevo tema"
       unread: "sin leer"
@@ -2731,8 +2716,6 @@ es:
       whisper: "esta publicación es un susurro privado para los moderadores"
       wiki:
         about: "esta publicación tiene formato wiki"
-      archetypes:
-        save: "Guardar opciones"
       few_likes_left: "¡Gracias por compartir amor! Solo te quedan unos pocos me gusta por hoy."
       controls:
         reply: "crear una respuesta a esta publicación"
@@ -2874,7 +2857,6 @@ es:
         post_number: "%{username}, publicación nº %{post_number}"
         show_all: "Mostrar todas"
     category:
-      can: "puede&hellip; "
       none: "(sin categoría)"
       all: "Todas las categorías"
       choose: "categoría&hellip;"
@@ -2908,7 +2890,6 @@ es:
       save_error: Se produjo un error al guardar la categoría
       name: "Nombre de la categoría"
       description: "Descripción"
-      topic: "tema de la categoría"
       logo: "Imagen (logo) para la categoría"
       background_image: "Imagen de fondo de la categoría"
       badge_colors: "Colores de las insignias"
@@ -4912,7 +4893,6 @@ es:
           perform: "Conceder insignia a los usuarios"
           upload_csv: Sube un archivo CSV con correos electrónicos o nombres de usuario
           aborted: Sube un archivo CSV que contenga correos electrónicos o nombres de usuario
-          success: Se recibió el CSV y los usuarios recibirán la insignia dentro de poco.
           replace_owners: Quitar insignia de los anteriores propietarios
       emoji:
         title: "Emoji"
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index bde26e93d5..ecc0565cbc 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -203,7 +203,6 @@ et:
     conduct: "Käitumise juhised"
     mobile_view: "Mobiilne vaade"
     desktop_view: "Täisvaade"
-    you: "Sina"
     or: "või"
     now: "just nüüd"
     read_more: "loe edasi"
@@ -280,7 +279,6 @@ et:
       remove: "Eemalda"
       remove_confirmation: "Oled kindel, et soovid selle mustandi kustutada?"
       new_topic: "Uus teema mustand"
-      new_private_message: "Uus privaatsõnumi mustand"
       topic_reply: "Mustandi vastus"
     topic_count_latest:
       one: "Vaata %{count} uut või uuendatud teemat"
@@ -569,8 +567,6 @@ et:
         public: "Avalik"
         private: "Privaatne"
         public_groups: "Avalikud grupid"
-        automatic_group: Automaatne grupp
-        close_group: Sulge grupp
         my_groups: "Minu grupid"
         group_type: "Grupi liik"
         is_group_user: "Liige"
@@ -642,6 +638,8 @@ et:
       flair_type:
         icon: "Vali ikoon"
         image: "Lae pilt üles"
+      default_notifications:
+        modal_yes: "Jah"
     user_action_groups:
       "1": "Meeldimisi antud"
       "2": "Meeldimisi saadud"
@@ -671,7 +669,6 @@ et:
       posts: "Postitust"
       topics: "Teemat"
       latest: "Viimased"
-      toggle_ordering: "lülita järjestus"
       subcategories: "Alamfoorumid"
       muted: "Vaigistatud kategooriad"
       topic_sentence:
@@ -988,7 +985,6 @@ et:
         secure_account: "Turva minu konto"
         latest_post: "Sa postitasid viimati..."
       last_posted: "Viimane postitus"
-      last_emailed: "Viimati meilitud"
       last_seen: "Vaadatud"
       created: "Liitus"
       log_out: "Logi välja"
@@ -1616,13 +1612,6 @@ et:
       defer:
         help: "Märgi mitteloetuks"
         title: "Lükka edasi"
-      feature_on_profile:
-        help: "Lisa selle teema link oma kasutajakaardile ja profiili"
-        title: "Tõsta profiilis esile"
-      remove_from_profile:
-        warning: "Su profiilis on juba esile tõstetud teema. Kui jätkad, asendab see teema olemasoleva."
-        help: "Eemalda oma profiilist selle teema link"
-        title: "Eemalda profiilist"
       list: "Teemad"
       new: "uus teema"
       unread: "lugemata"
@@ -2008,8 +1997,6 @@ et:
       whisper: "see postitus on vaikne sosin moderaatoritele"
       wiki:
         about: "see postitus on wiki"
-      archetypes:
-        save: "Salvesta suvandid"
       few_likes_left: "Aitäh poolehoiu jagamise eest! Tänaseks on vaid mõned meeldimised jäänud jagada."
       controls:
         reply: "alusta sellele postitusele vastuse koostamist"
@@ -2088,6 +2075,7 @@ et:
         edit: "Muuda järjehoidjat"
         created: "Loodud"
         name: "Nimi"
+        options: "Võimalused"
         actions:
           delete_bookmark:
             description: "Eemaldab järjehoidja sinu profiilist ja peatab kõik järjehoidja meeldetuletused"
@@ -2100,7 +2088,6 @@ et:
         viewing_summary: "Vaatad teema kokkuvõtet"
         show_all: "Näita kõiki"
     category:
-      can: "saab&hellip; "
       none: "(foorum puudub)"
       all: "Kõik foorumid"
       choose: "kategooria&hellip;"
@@ -2125,7 +2112,6 @@ et:
       save_error: Foorumi salvestamisel tekkis viga.
       name: "Foorumi nimetus"
       description: "Kirjeldus"
-      topic: "foorumi teema"
       logo: "foorumi logo"
       background_image: "Foorumi taustapilt"
       badge_colors: "Märgise värvid"
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index e8851b9ea3..30f505f86b 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -216,7 +216,6 @@ fa_IR:
     conduct: "دستورالعمل"
     mobile_view: "نمایش برای موبایل "
     desktop_view: "نمایش برای کامپیوتر"
-    you: "شما"
     or: "یا"
     now: "هم‌اکنون"
     read_more: "بیشتر بخوانید"
@@ -297,7 +296,6 @@ fa_IR:
       remove: "پاک کردن"
       remove_confirmation: "آیا مطمئن هستید که می‌خواهید این پیش‌نویس را حذف کنید؟"
       new_topic: "درفت جدید برای مبحث"
-      new_private_message: "درفت جدید برای پیام"
       topic_reply: "پاسخ درفت"
       abandon:
         confirm: "شما یک پاسخ ذخیره نیمه تمام در این تاپیک دارید. با آن چه می کنید؟"
@@ -694,8 +692,6 @@ fa_IR:
         public: "عمومی"
         private: "خصوصی"
         public_groups: "گروههای عمومی"
-        automatic_group: گروه خودکار
-        close_group: بستن گروه
         my_groups: "گروههای من"
         group_type: "نوع گروه"
         is_group_user: "عضو"
@@ -758,6 +754,8 @@ fa_IR:
       flair_type:
         icon: "یک آیکون را انتخاب کنید"
         image: "تصویری را بارگذاری کنید"
+      default_notifications:
+        modal_yes: "بله"
     user_action_groups:
       "1": "پسندهای داده شده"
       "2": "پسندهای دریافت شده"
@@ -787,7 +785,6 @@ fa_IR:
       posts: "نوشته‌ها"
       topics: "موضوعات"
       latest: "آخرین"
-      toggle_ordering: "ضامن کنترل مرتب سازی"
       subcategories: "دسته‌‌بندی‌های فرزند"
       topic_sentence:
         one: "%{count} موضوع"
@@ -1163,7 +1160,6 @@ fa_IR:
         browser_active: '%{browser} | <span class="active"> فعال است</span>'
         browser_last_seen: "%{browser} | %{date}"
       last_posted: "آخرین نوشته"
-      last_emailed: "آخرین ایمیل فرستاده شده"
       last_seen: "مشاهده"
       created: "عضو شده"
       log_out: "خروج"
@@ -2394,8 +2390,6 @@ fa_IR:
       whisper: "این ارسال نجوای خصوصی برای مدیران است"
       wiki:
         about: "این نوشته یک دانشنامه است"
-      archetypes:
-        save: " ذخیره تنظیمات"
       few_likes_left: "با تشکر از علاقه شما! فقط امکان چند پسندیدن دیگر را برای امروز دارید."
       controls:
         reply: "آغاز ساخت یک پاسخ به این نوشته"
@@ -2499,8 +2493,8 @@ fa_IR:
         updated: "به روز شده"
         name: "نام"
         set_reminder: "به من یادآوری کن"
+        options: "گزینه‌ها"
     category:
-      can: "can&hellip; "
       none: "(بدون دسته‌بندی)"
       all: "همه‌ی دسته‌بندی‌ها"
       edit: "ویرایش"
@@ -2526,7 +2520,6 @@ fa_IR:
       save_error: خطایی در ذخیره‌ی این دسته‌بندی روی داد.
       name: "نام دسته‌بندی"
       description: "توضیحات"
-      topic: "دسته‌بندی موضوع"
       logo: "تصویر لوگو برای دسته‌بندی"
       background_image: "تصویر پس‌زمینه برای دسته‌بندی"
       badge_colors: "رنگ نشان‌ها"
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 37416a5a2c..73c44d9610 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -220,7 +220,6 @@ fi:
     conduct: "Käytännesäännöt"
     mobile_view: "Mobiilinäkymä"
     desktop_view: "Työpöytänäkymä"
-    you: "Sinä"
     or: "tai"
     now: "hetki sitten"
     read_more: "lue lisää"
@@ -305,7 +304,6 @@ fi:
       remove: "Poista"
       remove_confirmation: "Haluatko varmasti poistaa luonnoksen?"
       new_topic: "Uusi ketjuluonnos"
-      new_private_message: "Uusi yksityisviestiluonnos"
       topic_reply: "Vastausluonnos"
       abandon:
         confirm: "Sinulla on meneillään luonnos tätä ketjua varten. Mitä haluaisit tehdä sen kanssa?"
@@ -379,7 +377,6 @@ fi:
         type_bonus:
           name: "tyyppibonus"
           title: "Henkilökunta voi määrittää tietyille käsiteltävälle tyypeille bonuksen, jotta ne saavat korkeamman prioriteetin."
-      stale_help: "Joku muu on ratkaissut tämän käsiteltävän kohteen."
       claim_help:
         optional: "Voit osoittaa tämän kohteen itsellesi, jolloin muut eivät voi käsitellä sitä."
         required: "Sinun täytyy osoittaa kohde itsellesi, ennen kuin voit käsitellä sen."
@@ -752,8 +749,6 @@ fi:
         public: "Julkinen"
         private: "Yksityinen"
         public_groups: "Julkiset ryhmät"
-        automatic_group: Automaattinen ryhmä
-        close_group: Sulje ryhmä
         my_groups: "Omat ryhmät"
         group_type: "Ryhmän tyyppi"
         is_group_user: "Jäsen"
@@ -859,7 +854,6 @@ fi:
       posts: "Viestit"
       topics: "Ketjut"
       latest: "Tuoreimmat"
-      toggle_ordering: "vaihda järjestystä"
       subcategories: "Ala-alueet"
       muted: "Vaimennetut alueet"
       topic_sentence:
@@ -1312,7 +1306,6 @@ fi:
         browser_active: '%{browser} | <span class="active">aktiivinen nyt</span>'
         browser_last_seen: "%{browser} | %{date}"
       last_posted: "Viimeisin viesti"
-      last_emailed: "Viimeisin sähköposti"
       last_seen: "Nähty"
       created: "Liittynyt"
       log_out: "Kirjaudu ulos"
@@ -1960,7 +1953,6 @@ fi:
           confirm: Sinulla on tallennettuna uusi ketjuluonnos, joka korvataan, jos luot liittyvän ketjun.
         reply_as_new_group_message:
           label: Vastaa uudessa ryhmäviestissä
-          desc: Luo uusi yksityisviesti, jossa samat vastaanottajat
         reply_as_private_message:
           label: Uusi viesti
           desc: Luo uusi yksityisviesti
@@ -2255,13 +2247,6 @@ fi:
       defer:
         help: "Merkitse lukemattomaksi"
         title: "Lykkää"
-      feature_on_profile:
-        help: "Lisää käyttäjäkorttiisi ja profiilisivullesi linkki tähän ketjuun"
-        title: "Valikoi ketju profiiliisi"
-      remove_from_profile:
-        warning: "Profiilillesi on jo valikoitu ketju. Jos jatkat, tämä ketju korvaa aiemman ketjun."
-        help: "Poista linkki tähän ketjuun käyttäjäprofiilissasi"
-        title: "Poista profiilista"
       list: "Ketjut"
       new: "uusi ketju"
       unread: "lukematta"
@@ -2740,8 +2725,6 @@ fi:
       whisper: "tämä viesti on yksityinen kuiskaus valvojille"
       wiki:
         about: "tämä viesti on wiki-viesti"
-      archetypes:
-        save: "Tallennusasetukset"
       few_likes_left: "Kiitos hyvän mielen levittämisestä! Sinulla on enää muutama tykkäys jäljellä tälle päivälle."
       controls:
         reply: "aloita vastaamaan tähän viestiin"
@@ -2883,7 +2866,6 @@ fi:
         post_number: "%{username}, viesti #%{post_number}"
         show_all: "Näytä kaikki"
     category:
-      can: "voivat&hellip; "
       none: "(ei aluetta)"
       all: "Kaikki alueet"
       choose: "alue&hellip;"
@@ -2917,7 +2899,6 @@ fi:
       save_error: Alueen tallennuksessa tapahtui virhe.
       name: "Alueen nimi"
       description: "Kuvaus"
-      topic: "alueen ketju"
       logo: "Alueen logokuva"
       background_image: "Alueen taustakuva"
       badge_colors: "Kunniamerkin värit"
@@ -4923,7 +4904,6 @@ fi:
           perform: "Myönnä kunniamerkki käyttäjille"
           upload_csv: Lataa CSV, jossa on joko käyttäjien sähköpostiosoitteita tai käyttäjätunnuksia
           aborted: Lataa CSV, joka sisältää joko käyttäjien sähköpostiosoitteita tai käyttäjätunnuksia
-          success: CSV tuli perille ja käyttäjät saavat kunniamerkkinsä pian.
           replace_owners: Poista kunniamerkki aiemmilta omistajilta
       emoji:
         title: "Emoji"
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index 7b382730a0..aac208c4a0 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -220,7 +220,6 @@ fr:
     conduct: "Code de conduite"
     mobile_view: "Version mobile"
     desktop_view: "Version ordinateur"
-    you: "Vous"
     or: "ou"
     now: "à l'instant"
     read_more: "lire la suite"
@@ -305,7 +304,6 @@ fr:
       remove: "Supprimer"
       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 ?"
@@ -379,7 +377,6 @@ fr:
         type_bonus:
           name: "indiquer le bonus"
           title: "Certains types d'éléments à examiner peuvent se voir attribuer un bonus par les responsables pour en élever la priorité."
-      stale_help: "Cet élément a déjà été examiné par quelqu'un d'autre."
       claim_help:
         optional: "Vous pouvez vous réserver cet élément pour empêcher d'autres responsables de l'examiner."
         required: "Vous devez réserver un élément avant de l'examiner."
@@ -752,8 +749,6 @@ fr:
         public: "Public"
         private: "Privé"
         public_groups: "Groupes publics"
-        automatic_group: Groupe automatique
-        close_group: Fermer le groupe
         my_groups: "Mes groupes (membre)"
         group_type: "Type de groupe"
         is_group_user: "Membre"
@@ -859,7 +854,6 @@ fr:
       posts: "Messages"
       topics: "Sujets"
       latest: "Récents"
-      toggle_ordering: "modifier le mode du tri"
       subcategories: "Sous-catégories"
       muted: "Catégories mises en sourdine"
       topic_sentence:
@@ -1312,7 +1306,6 @@ fr:
         browser_active: '%{browser} | <span class="active">actif</span>'
         browser_last_seen: "%{browser} | %{date}"
       last_posted: "Dernier message"
-      last_emailed: "Dernier courriel reçu"
       last_seen: "Vu"
       created: "Inscrit(e)"
       log_out: "Se déconnecter"
@@ -1955,7 +1948,6 @@ fr:
           confirm: Vos brouillons contiennent un nouveau sujet en cours de rédaction. Ce brouillon sera perdu si vous créez un sujet lié.
         reply_as_new_group_message:
           label: Répondre en créant un nouveau message de groupe
-          desc: Créer un nouveau message direct avec les mêmes destinataires
         reply_as_private_message:
           label: Nouveau message direct
           desc: Créer un nouveau message direct
@@ -2250,13 +2242,6 @@ fr:
       defer:
         help: "Marquer comme non lu"
         title: "Reporter à plus tard"
-      feature_on_profile:
-        help: "Ajouter un lien vers ce sujet sur votre carte d'utilisateur et votre profil"
-        title: "Mettre en avant sur le profil"
-      remove_from_profile:
-        warning: "Votre profil contient déjà un sujet vedette. Si vous continuez, ce sujet le remplacera."
-        help: "Supprimer le lien vers ce sujet de votre profil utilisateur"
-        title: "Supprimer du profil"
       list: "Sujets"
       new: "nouveau sujet"
       unread: "non lus"
@@ -2735,8 +2720,6 @@ fr:
       whisper: "ce message est un murmure privé pour les modérateurs"
       wiki:
         about: "ce message est un wiki"
-      archetypes:
-        save: "Enregistrer les options"
       few_likes_left: "Merci de partager votre amour ! Vous n'avez plus que quelques « J'aime » à attribuer aujourd'hui."
       controls:
         reply: "commencer à répondre à ce message"
@@ -2878,7 +2861,6 @@ fr:
         post_number: "%{username}, message #%{post_number}"
         show_all: "Tout afficher"
     category:
-      can: "peut&hellip; "
       none: "(aucune catégorie)"
       all: "Toutes les catégories"
       choose: "catégorie&hellip;"
@@ -2912,7 +2894,6 @@ fr:
       save_error: Une erreur s'est produite lors de l'enregistrement de la catégorie.
       name: "Nom de la catégorie"
       description: "Description"
-      topic: "sujet de la catégorie"
       logo: "Logo de la catégorie"
       background_image: "Image de fond de la catégorie"
       badge_colors: "Couleurs du badge"
@@ -3262,7 +3243,7 @@ fr:
         show_incoming_updated_topics: "%{shortcut} Afficher les sujets mis à jour"
         search: "%{shortcut} Rechercher"
         help: "%{shortcut} Ouvrir l'aide du clavier"
-        dismiss_new: "%{shortcut} Ignorer les nouveaux messages"
+        dismiss_new: "%{shortcut} Ignorer les nouveaux sujets"
         dismiss_topics: "%{shortcut} Ignorer les sujets"
         log_out: "%{shortcut} Se déconnecter"
       composing:
@@ -4919,7 +4900,6 @@ fr:
           perform: "Attribuer ce badge à ces utilisateurs"
           upload_csv: Envoyez un fichier CSV contenant les adresses courriel ou les noms d'utilisateur
           aborted: Envoyez d'abord un fichier CSV contenant des adresses de courriel ou des noms d'utilisateur
-          success: Votre fichier CSV a été envoyé, les utilisateurs obtiendront leur badge d'ici peu de temps.
           replace_owners: Retirer le badge des propriétaires précédents
       emoji:
         title: "Émoji"
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index f9d7e7d4bd..38d13cc917 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -219,7 +219,6 @@ gl:
     conduct: "Código de conduta"
     mobile_view: "Visualización móbil"
     desktop_view: "Visualización en escritorio"
-    you: "Vostede"
     or: "ou"
     now: "agora mesmiño"
     read_more: "ler máis"
@@ -298,7 +297,6 @@ gl:
       remove: "Retirar"
       remove_confirmation: "Confirma que quere retirar este borrador?"
       new_topic: "Borrador de novo tema"
-      new_private_message: "Borrador de nova mensaxe privada"
       topic_reply: "Borrador de resposta"
       abandon:
         confirm: "Ten un borrador en curso neste tema. Que lle gustaría facer con iso?"
@@ -716,8 +714,6 @@ gl:
         public: "Público"
         private: "Privado"
         public_groups: "Grupos públicos"
-        automatic_group: Grupo automático
-        close_group: Pechar grupo
         my_groups: "Os meus grupos"
         group_type: "Tipo de grupo"
         is_group_user: "Membro"
@@ -794,6 +790,10 @@ gl:
       flair_type:
         icon: "Seleccionar unha icona"
         image: "Cargar unha imaxe"
+      default_notifications:
+        modal_description: "Quere aplicar este cambio con efectos retroactivos? Isto afectará as preferencias de %{count} usuarios existentes."
+        modal_yes: "Si"
+        modal_no: "Non, aplicar só o cambio a partir de agora"
     user_action_groups:
       "1": "Gústames"
       "2": "Gústames"
@@ -823,7 +823,6 @@ gl:
       posts: "Publicacións"
       topics: "Temas"
       latest: "Últimos"
-      toggle_ordering: "trocar o control de ordenación"
       subcategories: "Subcategorías"
       muted: "Categorías silenciadas"
       topic_sentence:
@@ -1263,7 +1262,6 @@ gl:
         browser_active: '%{browser} | <span class="active">activo agora</span>'
         browser_last_seen: "%{browser} o %{date}"
       last_posted: "Última publicación"
-      last_emailed: "Últimos envíos por correo-e"
       last_seen: "Visto"
       created: "Inscrito"
       log_out: "Saír da sesión"
@@ -1892,7 +1890,6 @@ gl:
           confirm: Ten gardado un borrador do novo tema, que se sobrescribirá se crea un tema ligado a este.
         reply_as_new_group_message:
           label: Responder como nova mensaxe de grupo
-          desc: Crear unha nova mensaxe privada cos mesmos destinatarios
         reply_as_private_message:
           label: Nova mensaxe
           desc: Crear unha nova mensaxe privada
@@ -2177,13 +2174,6 @@ gl:
       defer:
         help: "Marcar como non lido"
         title: "Adiar"
-      feature_on_profile:
-        help: "Engadir unha ligazón a este tema na súa tarxeta de usuario e perfil"
-        title: "Funcionalidade no perfil"
-      remove_from_profile:
-        warning: "O seu perfil xa ten un tema de actualidade. Se continúa, este tema substituirá o existente."
-        help: "Retirar a ligazón a este tema do seu perfil de usuario"
-        title: "Retirar do perfil"
       list: "Temas"
       new: "novo tema"
       unread: "pendente"
@@ -2641,8 +2631,6 @@ gl:
       whisper: "este é un rumor privado para moderadores"
       wiki:
         about: "esta publicación é un wiki"
-      archetypes:
-        save: "Gardar opcións"
       few_likes_left: "Grazas por repartir cariño! Só lle quedan algúns gústame por hoxe."
       controls:
         reply: "escribir unha resposta a esta publicación"
@@ -2764,6 +2752,7 @@ gl:
         name: "Nome"
         name_placeholder: "Para que serve este marcador?"
         set_reminder: "Lémbreme"
+        options: "Opcións"
         actions:
           delete_bookmark:
             name: "Eliminar marcador"
@@ -2784,7 +2773,6 @@ gl:
         post_number: "%{username}, publicación #%{post_number}"
         show_all: "Amosar todas"
     category:
-      can: "pode&hellip; "
       none: "(sen categoría)"
       all: "Todas as categorías"
       choose: "categoría&hellip;"
@@ -2818,7 +2806,6 @@ gl:
       save_error: Produciuse un erro gardando a categoría.
       name: "Nome da categoría"
       description: "Descrición"
-      topic: "tema da categoría"
       logo: "Logotipo da categoría"
       background_image: "Imaxe do fondo da categoría"
       badge_colors: "Cores das insignias"
@@ -4771,7 +4758,6 @@ gl:
           perform: "Conceder insignia a usuarios"
           upload_csv: Cargar un CSV con enderezos de correo ou nomes de usuario
           aborted: Cargue un CSV que conteña os enderezos de correo ou os nomes de usuario
-          success: Recibimos o seu CSV. Os usuarios recibirán axiña a súa insignia.
           replace_owners: Retirar a insignia dos propietarios anteriores
       emoji:
         title: "Emoji"
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index 5fd627a1c6..ef6986f415 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -269,7 +269,6 @@ he:
     conduct: "נהלי התנהגות"
     mobile_view: "תצוגת נייד"
     desktop_view: "תצוגת מחשב"
-    you: "אני"
     or: "או"
     now: "ממש עכשיו"
     read_more: "המשך קריאה"
@@ -358,7 +357,7 @@ he:
       remove: "הסרה"
       remove_confirmation: "למחוק את הטיוטה הזאת?"
       new_topic: "טיוטת נושא חדשה"
-      new_private_message: "טיוטת הודעה פרטית חדשה"
+      new_private_message: "טיוטת הודעה אישית חדשה"
       topic_reply: "טיוטת תשובה"
       abandon:
         confirm: "יש טיוטה שהתחלת לערוך לנושא הזה. מה לעשות אתה?"
@@ -838,8 +837,6 @@ he:
         public: "ציבורי"
         private: "פרטי"
         public_groups: "קבוצות ציבוריות"
-        automatic_group: קבוצה אוטומטית
-        close_group: קבוצה סגורה
         my_groups: "הקבוצות שלי"
         group_type: "סוג קבוצה"
         is_group_user: "חבר"
@@ -918,6 +915,11 @@ he:
       flair_type:
         icon: "נא לבחור סמל"
         image: "העלאת תמונה"
+      default_notifications:
+        modal_title: "התראות בררת המחדל של המשתמש"
+        modal_description: "מעניין אותך להחיל את השינוי הזה רטרואקטיבית? פעולה זו תשנה את העדפותיהם של %{count} משתמשים קיימים."
+        modal_yes: "כן"
+        modal_no: "לא, להחיל את השינוי מעתה ואילך"
     user_action_groups:
       "1": "לייקים שהוענקו"
       "2": "לייקים שהתקבלו"
@@ -947,7 +949,6 @@ he:
       posts: "פוסטים"
       topics: "נושאים"
       latest: "לאחרונה"
-      toggle_ordering: "שינוי בקר סדר"
       subcategories: "תתי קטגוריות"
       muted: "קטגוריות מושתקות"
       topic_sentence:
@@ -1414,7 +1415,6 @@ he:
         browser_active: '%{browser} | <span class="active">פעיל כעת</span>'
         browser_last_seen: "%{browser} | %{date}"
       last_posted: "פוסט אחרון"
-      last_emailed: "נשלח לאחרונה בדואר אלקטרוני"
       last_seen: "נראה"
       created: "הצטרפו"
       log_out: "יציאה"
@@ -2103,7 +2103,6 @@ he:
           confirm: יש לך טיוטה של נושא חדש שתשוכתב בעת יציאת נושא מקושר.
         reply_as_new_group_message:
           label: להגיב בהודעה קבוצתית חדשה
-          desc: ליצור הודעה פרטית חדשה עם אותם הנמענים
         reply_as_private_message:
           label: הודעה חדשה
           desc: צור הודעה פרטית חדשה
@@ -2413,13 +2412,6 @@ he:
       defer:
         help: "סימון כלא נקראו"
         title: "אחר כך"
-      feature_on_profile:
-        help: "הוספת הנושא הזה לכרטיס המשתמש ולפרופיל שלך"
-        title: "הצגה בפרופיל"
-      remove_from_profile:
-        warning: "בפרופיל שלך כבר יש נושא מומלץ. המשך פעולה זו תחליף את הנושא הקיים."
-        help: "הסרת הקישור לנושא הזה בפרופיל המשתמש שלך"
-        title: "הסרה מהפרופיל"
       list: "נושאים"
       new: "נושא חדש"
       unread: "לא נקראו"
@@ -2946,8 +2938,6 @@ he:
       whisper: "פוסט זה הוא לחישה פרטית למפקחים"
       wiki:
         about: "הפוסט הוא ויקי"
-      archetypes:
-        save: "שמור אפשרויות"
       few_likes_left: "תודה על כל האהבה! נותרו לך סימוני לייק מועטים להיום."
       controls:
         reply: "התחילו לכתוב תגובה לפוסט זה"
@@ -3087,6 +3077,7 @@ he:
         name: "שם"
         name_placeholder: "עבור מה הסימנייה?"
         set_reminder: "להזכיר לי"
+        options: "אפשרויות"
         actions:
           delete_bookmark:
             name: "מחיקת סימנייה"
@@ -3107,7 +3098,6 @@ he:
         post_number: "%{username}, פוסט מס׳ %{post_number}"
         show_all: "להציג הכול"
     category:
-      can: "יכול&hellip; "
       none: "(ללא קטגוריה)"
       all: "כל הקטגוריות"
       choose: "קטגוריה&hellip;"
@@ -3141,7 +3131,6 @@ he:
       save_error: ארעה שגיאה בשמירת הקטגוריה הזו
       name: "שם הקטגוריה"
       description: "תיאור"
-      topic: "נושא הקטגוריה"
       logo: "תמונת לוגו לקטגוריה"
       background_image: "תמונת רקע לקטגוריה"
       badge_colors: "צבעי העיטורים"
@@ -3771,6 +3760,8 @@ he:
         regular: "רגיל"
         leader: "מוביל"
       detailed_name: "%{level}: %{name}"
+    pick_files_button:
+      unsupported_file_picked: "בחרת קובץ שאינו נתמך. סוגי קבצים נתמכים - %{types}."
   admin_js:
     type_to_filter: "הקלידו לסינון..."
     admin:
@@ -4007,6 +3998,7 @@ he:
               log_out: להוציא משתמש מכל ההפעלות שלו.
               anonymize: הפיכת חשבונות משתמשים לאלמוניים.
               delete: מחיקת חשבונות משתמשים.
+              list: קבלת רשימת משתמשים.
             email:
               receive_emails: לשלב את התחום הזה עם מקבל הודעות הדוא״ל כדי לעבד הודעות דוא״ל נכנסות.
       web_hooks:
@@ -4225,6 +4217,7 @@ he:
           theme: "ערכת עיצוב"
           component: "רכיב"
           components: "רכיבים"
+          filter_placeholder: "יש להקליד לסינון…"
           theme_name: "שם ערכת העיצוב"
           component_name: "שם רכיב"
           themes_intro: "נא לבחור בערכת עיצוב קיימת או להתקין חדשה כדי להתחיל"
@@ -5224,8 +5217,11 @@ he:
           perform: "להעניק עיטור למשתמשים"
           upload_csv: להעלות CSV עם כתובות דוא״ל או שמות משתמשים
           aborted: נא להעלות קובץ CSV שמכיל או כתובות דוא״ל או שמות משתמשים
-          success: ה־CSV שלך התקבל והמשתמשים יקבלו את העיטור שלהם בעוד רגע קט.
+          success: ה־CSV שלך התקבל ו־%{count} משתמשים יקבלו את העיטור שלהם בעוד רגע קט.
+          csv_has_unmatched_users: "הערכים הבאים נמצאים בקובץ ה־CSV אך לא ניתן היה להתאים אותם למשתמשים קיימים ולכן לא יקבלו את העיטור:"
+          csv_has_unmatched_users_truncated_list: "בקובץ ה־CSV היו %{count} רשומות שלא ניתן היה להתאים למשתמשים קיימים ולכן לא יקבלו את העיטור. בשל מספר הרשומות הרב ללא התאמה, רק 100 הראשונות מוצגות:"
           replace_owners: הסרת העיטור מהבעלים הקודמים
+          grant_existing_holders: הענקת עיטורים נוספים למחזיקים בעיטורים קיימים
       emoji:
         title: "אמוג׳י"
         help: "הוספת אמוג׳י חדשים שיהיו זמינים לכולם. (עצה למקצוענים: עדיף לגרור לכאן כמה קבצים בבת אחת)"
diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml
index 1ae1a0835a..12a95b0081 100644
--- a/config/locales/client.hu.yml
+++ b/config/locales/client.hu.yml
@@ -219,7 +219,6 @@ hu:
     conduct: "Magatartási kódex"
     mobile_view: "Mobil nézet"
     desktop_view: "Asztali nézet"
-    you: "Ön"
     or: "vagy"
     now: "épp most"
     read_more: "olvasás tovább"
@@ -303,7 +302,6 @@ hu:
       remove: "Eltávolítás"
       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?"
@@ -695,8 +693,6 @@ hu:
         public: "Nyilvános"
         private: "Privát"
         public_groups: "Nyilvános csoportok"
-        automatic_group: Automatikus csoport
-        close_group: Csoport lezárása
         my_groups: "Saját csoportok"
         group_type: "Csoport típusa"
         is_group_user: "Tag"
@@ -758,6 +754,8 @@ hu:
       flair_type:
         icon: "Válasszon ikont"
         image: "Kép feltöltése"
+      default_notifications:
+        modal_yes: "Igen"
     user_action_groups:
       "1": "Adott kedvelések"
       "2": "Kapott kedvelések"
@@ -787,7 +785,6 @@ hu:
       posts: "Bejegyzések"
       topics: "Témák"
       latest: "Legutóbbi"
-      toggle_ordering: "rendezés megfordítása"
       subcategories: "Alkategóriák"
       topic_sentence:
         one: "%{count} téma"
@@ -1148,7 +1145,6 @@ hu:
         was_this_you: "Ez Ön volt?"
         latest_post: "Legutóbbi bejegyzése…"
       last_posted: "Utolsó hozzászólás"
-      last_emailed: "Utolsó e-mail"
       last_seen: "Utolsó látogatás"
       created: "Tagság kezdete"
       log_out: "Kijelentkezés"
@@ -1662,8 +1658,6 @@ hu:
           label: Válasz egy csatolt témaként
           desc: Egy új téma létrehozása ezzel a témával kapcsolatban
           confirm: Elmentettük az új témavázlatodat, amelyet a program automatikusan felülír, ha csatolt témakört hozol létre.
-        reply_as_new_group_message:
-          desc: Új privát üzenet létrehozása ugyanazokkal a címzettekkel
         reply_as_private_message:
           label: Új üzenet
           desc: Személyes üzenet létrehozása
@@ -1866,13 +1860,6 @@ hu:
         title: "Áthelyezés a bejövő üzenetek közé"
       edit_message:
         title: "Szerkesztés"
-      feature_on_profile:
-        help: "Témára mutató hivatkozása hozzáadása a felhasználói kártyájához és profiljához"
-        title: "Megjelenítés kiemeltként a profiljában"
-      remove_from_profile:
-        warning: "A profiljának már van egy kiemelt témája. Ha folytatja, akkor a téma lecseréli a meglévő témát."
-        help: "A témára mutató hivatkozás eltávolítása a felhasználói profiljából"
-        title: "Eltávolítás a profilból"
       list: "Témák"
       new: "új téma"
       unread: "olvasatlan"
@@ -2177,8 +2164,6 @@ hu:
         discard: "Elvetés"
       via_email: "ez a válasz e-mailben érkezett"
       via_auto_generated_email: "ez a bejegyzés egy automatikusan generált e-mailen keresztül érkezett"
-      archetypes:
-        save: "Mentési beállítások"
       few_likes_left: "Köszönjük, hogy aktívan osztod a kedveléseket! A jóból is megárt a sok: már csak néhány kiosztható kedvelésed maradt mára."
       controls:
         reply: "kezdje meg a választ erre a bejegyzésre"
@@ -2266,6 +2251,7 @@ hu:
         name: "Név"
         name_placeholder: "Mire való ez a könyvjelző?"
         set_reminder: "Emlékeztess"
+        options: "Beállítások"
         actions:
           delete_bookmark:
             name: "Könyvjelző törlése"
@@ -2297,7 +2283,6 @@ hu:
       save_error: Hiba lépett fel a kategória mentése során!
       name: "Kategória neve"
       description: "Leírás"
-      topic: "Kategória témája"
       logo: "Kategória képe"
       background_image: "Kategória háttérképe"
       badge_colors: "Jelvény színek"
diff --git a/config/locales/client.hy.yml b/config/locales/client.hy.yml
index 7d796edb94..5102f46d7c 100644
--- a/config/locales/client.hy.yml
+++ b/config/locales/client.hy.yml
@@ -210,7 +210,6 @@ hy:
     conduct: "Վարքագծի Կանոններ"
     mobile_view: "Տեսքը Հեռախոսով"
     desktop_view: "Տեսքը Համակարգչով"
-    you: "Դուք "
     or: "կամ"
     now: "հենց նոր"
     read_more: "կարդալ ավելին"
@@ -279,7 +278,6 @@ hy:
       resume: "Վերսկսել"
       remove: "Ջնջել"
       new_topic: "Նոր թեմայի սևագիր"
-      new_private_message: "Նոր անձնական հաղորդագրության սևագիր"
       topic_reply: "Պատասխանի սևագիր"
       abandon:
         yes_value: "Չեղարկել"
@@ -623,8 +621,6 @@ hy:
         public: "Հրապարակային"
         private: "Գաղտնի"
         public_groups: "Հրապարակային Խմբեր"
-        automatic_group: Ավտոմատ Խումբ
-        close_group: Փակել Խումբը
         my_groups: "Իմ Խմբերը"
         group_type: "Խմբի տիպը"
         is_group_user: "Անդամ"
@@ -682,6 +678,10 @@ hy:
       flair_color_placeholder: "(Ընտրովի) Գույնի Hex արժեք"
       flair_preview_icon: "Նախադիտման Պատկերակ"
       flair_preview_image: "Նախադիտման Նկար"
+      default_notifications:
+        modal_description: "Ցանկանաու՞մ եք այս փոփոխությունը կիրառել պատմականորեն: Սա կփոխի կարգավորումը %{count} համար՝ առկա օգտատերերի:"
+        modal_yes: "Այո"
+        modal_no: "Ոչ, կիրառել փոփոխություններ միայն՝ ապագայում "
     user_action_groups:
       "1": "Տրված Հավանումներ"
       "2": "Ստացած Հավանումներ"
@@ -711,7 +711,6 @@ hy:
       posts: "Գրառումներ"
       topics: "Թեմաներ"
       latest: "Վերջինները"
-      toggle_ordering: "փոխանջատել դասավորման կառավորումը"
       subcategories: "Ենթակատեգորիաներ"
       topic_sentence:
         one: "%{count} թեմա"
@@ -1069,7 +1068,6 @@ hy:
         secure_account: "Ապահովագրել իմ Հաշիվը"
         latest_post: "Դուք վերջին անգամ հրապարակում կատարել եք..."
       last_posted: "Վերջին Գրառումը"
-      last_emailed: "Վերջինը Նամակ Ուղարկվել է"
       last_seen: "Ակտիվ էր"
       created: "Միացել է"
       log_out: "Դուրս գրվել"
@@ -1841,13 +1839,6 @@ hy:
       defer:
         help: "նշել որպես չընթերցված "
         title: "Հետաձգել"
-      feature_on_profile:
-        help: "Այս թեմայի հղումը կավելացվի օգտատիրոջ քարտում և ձեր պրոֆիլում:"
-        title: "Ավելացնել պրոֆիլում"
-      remove_from_profile:
-        warning: "Ձեր պրոֆիլում արդեն կա ընտրված թեման: Եթե դուք ​​շարունակեք, ապա՝ այդ թեման կփոխարինի առկա թեմային:"
-        help: "Հեռացրեք այս թեմայի հղումը ձեր պրոֆիլում "
-        title: "Հեռացնել Պրոֆիլից "
       list: "Թեմաներ"
       new: "նոր թեմա"
       unread: "չկարդացած"
@@ -2237,8 +2228,6 @@ hy:
       whisper: "այս գրառումը գաղտնի շշուկ է մոդերատորների համար"
       wiki:
         about: "այս գրառումը wiki է"
-      archetypes:
-        save: "Պահպանելու Տարբերակները"
       few_likes_left: "Շնորհակալ ենք տրված հավանումների համար: Այսօր Ձեզ մնացել է միայն մի քանի հավանում:"
       controls:
         reply: "պատասխանել այս գրառմանը"
@@ -2344,6 +2333,7 @@ hy:
         name: "Անուն"
         name_placeholder: "Ինչի՞ համար է այս էջանշանը: "
         set_reminder: "Հիշեցնել ինձ"
+        options: "Տարբերակներ"
         actions:
           delete_bookmark:
             name: "Ջնջել էջանշանը"
@@ -2352,7 +2342,6 @@ hy:
             name: "Խմբագրել էջանշանը"
             description: "Խմբագրել էջանշանի անվանումը կամ փոխել հիշեցման ամսաթիվը / ժամանակը"
     category:
-      can: "կարող է&hellip; "
       none: "(կատեգորիա չկա)"
       all: "Բոլոր կատեգորիաները"
       choose: "կատեգորիա&hellip;"
@@ -2384,7 +2373,6 @@ hy:
       save_error: 'Կատեգորիան պահելիս տեղի է ունեցել սխալ:'
       name: "Կատեգորիայի Անունը"
       description: "Նկարագրույթուն"
-      topic: "կատեգորիայի թեմա"
       logo: "Կատեգորիայի Լոգոյի Նկարը"
       background_image: "Կատեգորիայի Ֆոնի Նկարը"
       badge_colors: "Կրծքանշանի գույները"
@@ -4159,7 +4147,6 @@ hy:
           perform: "Պարգևատրել Օգտատերերին՝ Կրծքանշանով "
           upload_csv: Վերբեռնեք <b>CSV</b> օգտատիրոջ էլ. հասցեով կամ օգտանունով
           aborted: 'Խնդրում ենք վերբեռնել <b>CSV</b> , օգտատիրոջ էլ. հասցեով կամ օգտանունով:'
-          success: 'CSV վերբեռնվել է, և շուտով օգտատերերը կստանան իրենց կրծքանշանը:'
           replace_owners: Հեռացնել նախորդ սեփականատիրոջ կրծքանշանը
       emoji:
         title: "Էմոջի"
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index 52b6b96e70..034f037a02 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -193,7 +193,6 @@ id:
     conduct: "Kode Etik"
     mobile_view: "Tampilan Mobile"
     desktop_view: "Tampilan Desktop"
-    you: "Anda"
     or: "atau"
     now: "baru saja"
     read_more: "baca selengkapnya"
@@ -260,7 +259,6 @@ id:
       resume: "Lanjut"
       remove: "Hapus"
       new_topic: "Konsep topik baru"
-      new_private_message: "Konsep pesan pribadi baru"
       topic_reply: "Balasan konsep"
       abandon:
         yes_value: "Batalkan"
@@ -616,8 +614,6 @@ id:
         public: "Umum"
         private: "Pribadi"
         public_groups: "Grup Umum"
-        automatic_group: Grup Otomatis
-        close_group: Tutup Grup
         my_groups: "Grupku"
         group_type: "Tipe Grup"
         is_group_user: "Anggota"
@@ -671,6 +667,8 @@ id:
       flair_color_placeholder: "(Opsional) Nilai warna dalam Hex"
       flair_preview_icon: "Pratinjau Ikon"
       flair_preview_image: "Pratinjau Gambar"
+      default_notifications:
+        modal_yes: "Ya"
     user_action_groups:
       "1": "Likes Diberikan"
       "2": "Likes Diterima"
@@ -700,7 +698,6 @@ id:
       posts: "Post"
       topics: "Topik"
       latest: "Terbaru"
-      toggle_ordering: "beralih memesan kontrol"
       subcategories: "Subkategori"
       topic_sentence:
         other: "%{count} topik"
@@ -970,7 +967,6 @@ id:
         not_you: "Bukan Anda?"
         secure_account: "Amankan Akun saya"
       last_posted: "Tulisan Terakhir"
-      last_emailed: "Terakhir Surel Dikirimkan"
       last_seen: "Seen"
       created: "Joined"
       log_out: "Keluar"
@@ -1504,6 +1500,7 @@ id:
       bookmarks:
         created: "Dibuat"
         name: "Nama"
+        options: "Pilihan"
     category:
       edit: "Ubah"
       settings: "Pengaturan"
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index eb42438c14..d6cfca2c31 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -41,6 +41,7 @@ it:
       long_date_without_year_with_linebreak: "D MMM <br/>LT"
       long_date_with_year_with_linebreak: "D MMM 'YY <br/>LT"
       wrap_ago: "%{date} fa"
+      wrap_on: "il %{date}"
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
@@ -220,7 +221,6 @@ it:
     conduct: "Codice di Condotta"
     mobile_view: "Visualizzazione cellulari"
     desktop_view: "Visualizzazione Desktop"
-    you: "Tu"
     or: "oppure"
     now: "proprio ora"
     read_more: "altre informazioni"
@@ -305,7 +305,7 @@ it:
       remove: "Rimuovi"
       remove_confirmation: "Vuoi davvero eliminare questa bozza?"
       new_topic: "Nuovo argomento in bozza"
-      new_private_message: "Nuovo messaggio privato 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?"
@@ -379,7 +379,7 @@ it:
         type_bonus:
           name: "tipo di bonus"
           title: "Ad alcune tipologie revisionabili può essere assegnato un bonus dallo staff, per aumentare la loro priorità."
-      stale_help: "La revisione di questo elemento è stata condotta da qualcun altro."
+      stale_help: "La revisione di questo elemento è stata condotta da <b>%{username}</b>."
       claim_help:
         optional: "Puoi rivendicare questo elemento per evitare che altri lo revisionino."
         required: "Per poter revisionare gli elementi devi prima rivendicarli."
@@ -603,7 +603,7 @@ it:
         remove_user_as_group_owner: "Revoca proprietà"
     groups:
       member_added: "Aggiunto"
-      member_requested: "Richiesto alle"
+      member_requested: "Richiesto il"
       add_members:
         title: "Aggiungi utenti a %{group_name}"
         description: "Inserisci un elenco di utenti che desideri invitare al gruppo o incollalo in un elenco separato da virgole:"
@@ -752,8 +752,6 @@ it:
         public: "Pubblico"
         private: "Privato"
         public_groups: "Gruppi Pubblici"
-        automatic_group: Gruppo Automatico
-        close_group: Gruppo Chiuso
         my_groups: "I Miei Gruppi"
         group_type: "Tipo di gruppo"
         is_group_user: "Membro"
@@ -830,6 +828,11 @@ it:
       flair_type:
         icon: "Seleziona un'icona"
         image: "Carica un'immagine"
+      default_notifications:
+        modal_title: "Notifiche predefinite dell'utente"
+        modal_description: "Desideri applicare questa modifica retroattivamente? Questo cambierà le preferenze per %{count} utenti esistenti."
+        modal_yes: "Sì"
+        modal_no: "No, applica le modifiche solo da adesso in avanti"
     user_action_groups:
       "1": "Mi piace - Assegnati"
       "2": "Mi piace - Ricevuti"
@@ -859,7 +862,6 @@ it:
       posts: "Messaggi"
       topics: "Argomenti"
       latest: "Più recenti"
-      toggle_ordering: "inverti l'ordinamento"
       subcategories: "Sottocategorie"
       muted: "Categorie silenziate"
       topic_sentence:
@@ -992,7 +994,7 @@ it:
         Inizia ad aggiungere segnalibri ai messaggi con il pulsante %{icon}. Essi saranno elencati qui per facilitarne la consultazione. Puoi anche impostare un promemoria!
       no_notifications_title: "Non hai ancora notifiche"
       no_notifications_body: >
-        Riceverai una notifica in questo pannello sulle attività che ti riguardano direttamente, quali risposte ai tuoi argomenti e messaggi. quando qualcuno ti <b>@menziona</b> o ti cita e risponde agli argomenti che stai osservando. Le notifiche verranno inviate anche alla tua e-mail quando non hai effettuato l'accesso per un po' di tempo. <br><br> Cerca %{icon} per decidere su quali argomenti, categorie e tag essere informato. Per ulteriori informazioni, consulta le tue <a href='%{preferencesUrl}'>preferenze di notifica</a>.
+        Riceverai una notifica in questo pannello sulle attività che ti riguardano direttamente, quali risposte ai tuoi argomenti e messaggi. quando qualcuno ti <b>@menziona</b> o ti cita e risponde agli argomenti che stai osservando. Le notifiche verranno inviate anche alla tua e-mail quando non hai effettuato l'accesso per un po' di tempo. <br><br> Cerca %{icon} per decidere su quali argomenti, categorie ed etichette essere informato. Per ulteriori informazioni, consulta le tue <a href='%{preferencesUrl}'>preferenze di notifica</a>.
       first_notification: "La tua prima notifica! Selezionala per iniziare."
       dynamic_favicon: "Mostra il contatore sull'icona del browser"
       skip_new_user_tips:
@@ -1078,7 +1080,7 @@ it:
       ignored_users_instructions: "Elimina tutti i messaggi, le notifiche e MP da questi utenti."
       tracked_topics_link: "Mostra"
       automatically_unpin_topics: "Spunta automaticamente gli argomenti quando arrivi in fondo."
-      apps: "Applicazioni"
+      apps: "App"
       revoke_access: "Revoca Accesso"
       undo_revoke_access: "Annullare Revoca Accesso"
       api_approved: "Approvato:"
@@ -1290,7 +1292,7 @@ it:
         title: "Lingua dell'interfaccia"
         instructions: "Lingua dell'interfaccia utente. Cambierà quando aggiornerai la pagina."
         default: "(default)"
-        any: "qualunque"
+        any: "tutti"
       password_confirmation:
         title: "Ripeti la password"
       invite_code:
@@ -1312,9 +1314,8 @@ it:
         browser_active: '%{browser} | <span class="active">attivo ora</span>'
         browser_last_seen: "%{browser} | %{date}"
       last_posted: "Ultimo Messaggio"
-      last_emailed: "Ultima email inviata"
       last_seen: "Ultima visita"
-      created: "Membro da"
+      created: "Iscritto"
       log_out: "Disconnetti"
       location: "Località"
       website: "Sito Web"
@@ -1387,7 +1388,7 @@ it:
         pending_tab_with_count: "In sospeso (%{count})"
         expired_tab: "Scaduto"
         expired_tab_with_count: "Scaduti (%{count})"
-        redeemed_tab: "Riscattato"
+        redeemed_tab: "Accettato"
         redeemed_tab_with_count: "Accettati (%{count})"
         invited_via: "Invito"
         invited_via_link: "Link %{key} (%{count} / %{max} accettati)"
@@ -1447,7 +1448,7 @@ it:
           max_redemptions_allowed: "Limite max di utilizzi"
           add_to_groups: "Aggiungi ai gruppi"
           invite_to_topic: "Invia a questo argomento"
-          expires_at: "Scadenza dopo"
+          expires_at: "Scadenza:"
           custom_message: "Messaggio personale facoltativo"
           send_invite_email: "Salva e invia Email"
           save_invite: "Salva invito"
@@ -1591,7 +1592,7 @@ it:
       exceeded_minute_MF: "<b>{relativeAge}</b> — <a href='{url}' target='_blank'>{rate, plural, one {# errore/minuto} other {# errori/minuto}}</a> ha superato il limite di {limit, plural, one {# errore/minuto} other {# errori/minuto}} impostato dal sito."
     learn_more: "per saperne di più..."
     first_post: Primo messaggio
-    mute: Ignora
+    mute: Silenzia
     unmute: Riattiva
     last_post: Pubblicato
     local_time: "Ora Locale"
@@ -1704,7 +1705,7 @@ it:
       authenticating: "Autenticazione..."
       awaiting_activation: "Il tuo account è in attesa di attivazione, utilizza il collegamento per la password dimenticata per ricevere un'altra email di attivazione."
       awaiting_approval: "Il tuo account non è stato ancora approvato da un membro dello staff. Ti invieremo un'email non appena verrà approvato."
-      requires_invite: "Spiacenti, l'accesso a questo forum e solo ad invito."
+      requires_invite: "Spiacenti, l'accesso a questo forum è solo ad invito."
       not_activated: "Non puoi ancora accedere. Abbiamo inviato un'email di attivazione a <b>%{sentTo}</b>. Ti preghiamo di seguire le istruzioni contenute nell'email per attivare l'account."
       not_allowed_from_ip_address: "Non puoi accedere da quell'indirizzo IP."
       admin_not_allowed_from_ip_address: "Non puoi accedere come amministratore da quell'indirizzo IP."
@@ -1914,7 +1915,7 @@ it:
       italic_label: "I"
       italic_title: "Corsivo"
       italic_text: "testo in corsivo"
-      link_title: "Collegamento"
+      link_title: "Hyperlink"
       link_description: "inserisci qui la descrizione del collegamento"
       link_dialog_title: "Inserisci il collegamento"
       link_optional_text: "titolo opzionale"
@@ -1960,7 +1961,7 @@ it:
           confirm: È stata salvata una nuova bozza di argomento, che verrà sovrascritta se si crea un argomento collegato.
         reply_as_new_group_message:
           label: Rispondi come nuovo messaggio di gruppo
-          desc: Crea un nuovo messaggio privato con gli stessi destinatari
+          desc: Crea un nuovo messaggio iniziando con gli stessi destinatari
         reply_as_private_message:
           label: Nuovo messaggio
           desc: Crea un nuovo messaggio personale
@@ -1968,7 +1969,7 @@ it:
           label: Rispondi all'argomento
           desc: Rispondi all'argomento, non a uno specifico messaggio
         toggle_whisper:
-          label: Interruttore Sussurri
+          label: Attiva/disattiva sussurri
           desc: I Sussurri sono visibili solo ai membri dello staff
         create_topic:
           label: "Nuovo Argomento"
@@ -2009,8 +2010,8 @@ it:
         one: "<span class='multi-user'>%{username}, %{username2} e %{count} altro</span> %{description}"
         other: "<span class='multi-user'>%{username}, %{username2} e altri %{count}</span> %{description}"
       liked_consolidated_description:
-        one: "ha messo \"mi piace\" a %{count} tuo messaggio"
-        other: "ha messo \"mi piace\" a %{count} dei tuoi messaggi"
+        one: "ha messo \"mi piace\" a %{count} dei tuoi messaggi"
+        other: "hanno messo \"mi piace\" a %{count} dei tuoi messaggi"
       liked_consolidated: "<span>%{username}</span> %{description}"
       private_message: "<span>%{username}</span> %{description}"
       invited_to_private_message: "<p><span>%{username}</span> %{description}"
@@ -2187,7 +2188,7 @@ it:
         also_dismiss_topics: "Smetti di seguire questi argomenti in modo che non vengano più visualizzati come non letti per me"
         dismiss_new: "Ignora i nuovi messaggi"
         dismiss_new_with_selected:
-          one: "Ignora nuovo (%{count})"
+          one: "Ignora (%{count}) nuovo"
           other: "Ignora i nuovi (%{count})"
         toggle: "interruttore di selezione multipla degli argomenti"
         actions: "Azioni Multiple"
@@ -2255,13 +2256,6 @@ it:
       defer:
         help: "Contrassegna come non letto"
         title: "Leggi più tardi"
-      feature_on_profile:
-        help: "Aggiungi un collegamento a questo argomento sulla tua scheda utente e sul tuo profilo"
-        title: "In evidenza Sul Profilo"
-      remove_from_profile:
-        warning: "Il tuo profilo ha già un argomento in primo piano. Se continui, questo argomento sostituirà l'argomento esistente."
-        help: "Rimuovi il collegamento a questo argomento dal tuo profilo utente"
-        title: "Rimuovi Dal Profilo"
       list: "Argomenti"
       new: "nuovo argomento"
       unread: "non letto"
@@ -2403,7 +2397,7 @@ it:
         back_description: "Torna indietro al tuo ultimo messaggio non letto"
         replies_short: "%{current} / %{total}"
       progress:
-        title: Avanzamento dell'argomento
+        title: Avanzamento lettura argomento
         go_top: "alto"
         go_bottom: "basso"
         go: "vai"
@@ -2741,8 +2735,6 @@ it:
       whisper: "questo messaggio è un sussurro privato per i moderatori"
       wiki:
         about: "questo messaggio è una wiki"
-      archetypes:
-        save: "Opzioni di salvataggio"
       few_likes_left: "Grazie per aver condiviso affetto! Hai ancora pochi \"Mi piace\" rimasti per oggi."
       controls:
         reply: "inizia a comporre una risposta a questo messaggio"
@@ -2864,6 +2856,7 @@ it:
         name: "Nome"
         name_placeholder: "A cosa serve questo segnalibro?"
         set_reminder: "Ricordamelo"
+        options: "Opzioni"
         actions:
           delete_bookmark:
             name: "Cancella segnalibro"
@@ -2884,7 +2877,6 @@ it:
         post_number: "%{username}, messaggio n. %{post_number}"
         show_all: "Mostra tutto"
     category:
-      can: "può&hellip;"
       none: "(nessuna categoria)"
       all: "Tutte le categorie"
       choose: "categoria&hellip;"
@@ -2918,7 +2910,6 @@ it:
       save_error: Si è verificato un errore durante il salvataggio della categoria.
       name: "Nome Categoria"
       description: "Descrizione"
-      topic: "argomento della categoria"
       logo: "Immagine Categoria"
       background_image: "Immagine di sfondo della categoria"
       badge_colors: "Colori dei distintivi"
@@ -2985,7 +2976,7 @@ it:
           title: "In osservazione"
           description: "Osserverai automaticamente tutti gli argomenti in questa categoria. Riceverai notifiche per ogni nuovo messaggio in ogni argomento, e apparirà il conteggio delle nuove risposte."
         watching_first_post:
-          title: "Osservando il Primo Messaggio"
+          title: "Osservazione Primo Messaggio"
           description: "Riceverai una notifica di nuovi argomenti in questa categoria, ma non per le risposte agli argomenti."
         tracking:
           title: "Seguita"
@@ -3417,7 +3408,7 @@ it:
           title: "In osservazione"
           description: "Visualizzerai automaticamente tutti gli Argomenti con questa Etichetta. Riceverai una notifica per tutti i nuovi messaggi e Argomenti. Inoltre, accanto all'Argomento apparirà il conteggio dei messaggi non letti e di quelli nuovi."
         watching_first_post:
-          title: "Osserva Primo Messaggio"
+          title: "Osservazione Primo Messaggio"
           description: "Riceverai una notifica se saranno aperti nuovi Argomenti in questa Etichetta, ma non per le risposte agli Argomenti."
         tracking:
           title: "Seguito"
@@ -3497,6 +3488,8 @@ it:
         regular: "esperto"
         leader: "veterano"
       detailed_name: "%{level} - %{name}"
+    pick_files_button:
+      unsupported_file_picked: "Hai scelto un file non supportato. Tipi di file supportati: %{types}."
   admin_js:
     type_to_filter: "digita per filtrare..."
     admin:
@@ -3591,7 +3584,7 @@ it:
           total: "Totale generale"
           no_data: "Non ci sono dati da mostrare."
           trending_search:
-            more: '<a href="%{basePath}/admin/logs/search_logs">Cerca nei log</a>'
+            more: '<a href="%{basePath}/admin/logs/search_logs">Ricerche nei log</a>'
             disabled: 'Il rapporto sulle ricerche di tendenza è disabilitato. Attiva l''opzione <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">query di ricerca nei log</a> per iniziare a raccogliere i dati.'
           average_chart_label: Media
           filters:
@@ -3727,6 +3720,7 @@ it:
               log_out: Disconnetti tutte le sessioni per un utente.
               anonymize: Rendi anonimi gli account utente.
               delete: Elimina account utente.
+              list: Ottieni un elenco di utenti.
             email:
               receive_emails: Combina questo ambito con il destinatario della posta per elaborare le email in arrivo.
       web_hooks:
@@ -4224,7 +4218,7 @@ it:
           modal:
             title: "Dettagli posta in arrivo"
             error: "Errore"
-            headers: "Intestazione"
+            headers: "Intestazioni"
             subject: "Oggetto"
             body: "Corpo"
             rejection_message: "Messaggio rifiutato"
@@ -4408,7 +4402,7 @@ it:
             text: "Roll up"
             title: "Crea nuovi elenchi di indirizzi IP interdetti se ci sono almeno 'min_ban_entries_for_roll_up' elementi."
         search_logs:
-          title: "Cerca nei log"
+          title: "Log di ricerca"
           term: "Termine"
           searches: "Ricerche"
           click_through_rate: "CTR"
@@ -4446,9 +4440,13 @@ it:
           censor: "Consenti i messaggi contenenti queste parole, ma sostituiscile con caratteri che nascondono le parole censurate."
           require_approval: "I messaggi contenenti queste parole richiederanno l'approvazione dello staff prima di poter essere visualizzati."
           flag: "Consenti i messaggi contenenti queste parole, ma segnalale come inappropriate in modo che i moderatori possano revisionarle."
+          replace: "Sostituisci le parole nei messaggi con altre parole"
+          tag: "Etichetta automaticamente gli argomenti in base al primo messaggio"
           silence: "I primi post degli utenti che contengono queste parole richiederanno l'approvazione dello staff prima di essere visibili, e l'utente verrà automaticamente silenziato."
           link: "Nei messaggi sostituisce le parole con link"
         form:
+          label: "Ha una parola o frase"
+          placeholder: "Inserisci parola o frase (* è un carattere jolly)"
           placeholder_regexp: "espressione regolare"
           replace_label: "Sostituzione"
           replace_placeholder: "esempio"
@@ -4462,6 +4460,7 @@ it:
           upload_successful: "Caricamento andato a buon fine. Le parole sono state aggiunte."
         test:
           button_label: "Test"
+          modal_title: "%{action}: Test delle parole osservate"
           description: "Inserisci il testo qui sotto per verificare la corrispondenza con le parole osservate"
           found_matches: "Trovate corrispondenze:"
           no_matches: "Nessun risultato trovato"
@@ -4546,6 +4545,7 @@ it:
         penalty_post_edit: "Modifica il messaggio"
         penalty_post_none: "Non fare nulla"
         penalty_count: "Conteggio Penalità"
+        penalty_history: "Cronologia delle penalizzazioni"
         clear_penalty_history:
           title: "Cancella cronologia delle penalizzazioni"
           description: "utenti con penalizzazioni non possono accedere al Livello di affidabilità 3"
@@ -4587,6 +4587,8 @@ it:
         flags_given_count: Segnalazioni Fatte
         flags_received_count: Segnalazioni Ricevute
         warnings_received_count: Avvertimenti Ricevuti
+        warnings_list_warning: |
+          In qualità di moderatore, potresti non essere in grado di visualizzare tutti questi argomenti. Se necessario, chiedi a un amministratore o al moderatore addetto alla pubblicazione di concedere ai <b>@moderatori</b> accesso al messaggio.
         flags_given_received_count: "Segnalazioni Fatte / Ricevute"
         approve: "Approva"
         approved_by: "approvato da"
@@ -4606,7 +4608,7 @@ it:
           prompt:
             title: "Trasferisci ed Elimina @%{username}"
             description: |
-              <p>Scegli un nuovo proprietario per i contenuti di <b>@%{username}</b></p>
+              <p>Scegli un nuovo proprietario per i contenuti di <b>@%{username}</b>.</p>
 
               <p>Tutti gli argomenti, messaggi pubblici e privati e altri contenuti creati da <b>@%{username}</b> verranno trasferiti.</p>
             target_username_placeholder: "Nome utente del nuovo proprietario"
@@ -4677,6 +4679,9 @@ it:
         trust_level_unlocked_tip: "il livello di attendibilità è sbloccato, il sistema può promuovere o degradare l'utente"
         lock_trust_level: "Blocca livello di attendibilità"
         unlock_trust_level: "Sblocca livello di attendibilità"
+        silenced_count: "Silenziati"
+        suspended_count: "Sospesi"
+        last_six_months: "Ultimi 6 mesi"
         tl3_requirements:
           title: "Requisiti per livello di attendibilità 3"
           table_title:
@@ -4754,6 +4759,7 @@ it:
           text: "Campo Testo"
           confirm: "Conferma"
           dropdown: "A discesa"
+          multiselect: "Selezione multipla"
       site_text:
         description: "Puoi personalizzare qualsiasi testo del tuo forum. Comincia effettuando una ricerca qui sotto:"
         search: "Trova il testo che vorresti modificare"
@@ -4917,8 +4923,11 @@ it:
           perform: "Assegna Distintivo agli Utenti"
           upload_csv: Carica un CSV con indirizzi email o nomi degli utenti
           aborted: Carica un CSV contenente indirizzi email o i nomi degli utenti
-          success: Il tuo CSV è stato ricevuto e gli utenti riceveranno il loro distintivo a breve.
+          success: Il tuo CSV è stato ricevuto e %{count} utenti riceveranno il loro distintivo a breve.
+          csv_has_unmatched_users: "Le seguenti voci sono nel file CSV ma non possono essere abbinate agli utenti esistenti e quindi non riceveranno il distintivo:"
+          csv_has_unmatched_users_truncated_list: "C'erano %{count} elementi nel file CSV che non è stato possibile abbinare a utenti esistenti e quindi non riceveranno il badge. A causa del gran numero di elementi privi di abbinamenti, sono mostrati solo i primi 100:"
           replace_owners: Rimuovi il distintivo dai precedenti proprietari
+          grant_existing_holders: Assegna distintivi aggiuntivi ai titolari di distintivi già esistenti
       emoji:
         title: "Emoji"
         help: "Aggiungi nuovi emoji da mettere a disposizione per tutti. (Suggerimento: trascina e rilascia più file in una volta sola)"
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index a27e777453..035f0f4468 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -40,6 +40,7 @@ ja:
       long_date_without_year_with_linebreak: "MMM D 日 <br/>LT"
       long_date_with_year_with_linebreak: "'YY 年 MMM D 日 <br/>LT"
       wrap_ago: "%{date}前"
+      wrap_on: "%{date}"
       tiny:
         half_a_minute: "1 分未満"
         less_than_x_seconds:
@@ -137,7 +138,7 @@ ja:
     wizard_required: "Discourse へようこそ！ <a href='%{url}' data-auto-route='true'>セットアップウィザード</a>から始めましょう"
     emails_are_disabled: "メールの送信は管理者によって無効化されています。メール通知は一切送信されません。"
     software_update_prompt:
-      message: "このサイトを更新たので、<span>再読み込みしてください</span>。再読み込みしない場合、予期しない動作が発生する可能性があります。"
+      message: "このサイトを更新したので、<span>再読み込みしてください</span>。再読み込みしない場合、予期しない動作が発生する可能性があります。"
       dismiss: "閉じる"
     bootstrap_mode_enabled:
       other: "新しいサイトを簡単に立ち上げられるように、ブートストラップモードになっています。すべての新規ユーザーの信頼レベルは 1 となり、要約メールを毎日受け取るように設定されています。この設定は %{count} 名のユーザーが参加すると自動的に無効になります。"
@@ -196,7 +197,6 @@ ja:
     conduct: "行動規範"
     mobile_view: "モバイルビュー"
     desktop_view: "デスクトップビュー"
-    you: "あなた"
     or: "または"
     now: "たった今"
     read_more: "もっと読む"
@@ -279,7 +279,7 @@ ja:
       remove: "削除"
       remove_confirmation: "この下書きを削除してもよろしいですか？"
       new_topic: "新しいトピックの下書き"
-      new_private_message: "新しいプライベートメッセージの下書き"
+      new_private_message: "新しい個人メッセージの下書き"
       topic_reply: "返信の下書き"
       abandon:
         confirm: "このトピックの作成中の下書きがあります。どうしますか？"
@@ -350,7 +350,7 @@ ja:
         type_bonus:
           name: "タイプボーナス"
           title: "特定のレビュー待ち項目タイプには、スタッフがボーナスを割り当てて優先順位を上げられます。"
-      stale_help: "このレビュー待ち項目は他の人によって解決されました。"
+      stale_help: "このレビュー待ち項目は <b>%{username}</b> によって解決されました。"
       claim_help:
         optional: "この項目を自分に割り当ててほかのユーザーがレビューしないようにできます。"
         required: "レビューする前に項目を自分に割り当てる必要があります。"
@@ -605,7 +605,7 @@ ja:
           smtp_instructions: "このグループで SMTP を有効化すると、グループの受信トレイから送信されるすべての送信メールは、フォーラムが送信するほかのメール用に構成されているメールサーバーではなく、ここで指定される SMTP 設定を介して送信されます。"
           imap_title: "IMAP"
           imap_additional_settings: "追加設定"
-          imap_instructions: 'このグループで IMAP を有効化すると、グループの受信トレイと指定された IMAP サーバーとメールボックスの間でメールが同期されます。IMAP を有効にする前に、テスト済みの有効な資格情報で SMTP を有効にする必要があります。SMTP に使用されるメールのユーザー名とパスワードが IMAP にも使用されます。詳細は、<a target="_blank" href="https://meta.discourse.org/t/imap-support-for-group-inboxes/160588">Discourse Meta の機能に関するお知らせ</a>をご覧ください。'
+          imap_instructions: 'このグループで IMAP を有効化すると、グループの受信トレイと指定された IMAP サーバーとメールボックスの間でメールが同期されます。IMAP を有効にする前に、テスト済みの有効な資格情報で SMTP を有効にする必要があります。SMTP に使用されるメールのユーザー名とパスワードが IMAP にも使用されます。詳細は、「<a target="_blank" href="https://meta.discourse.org/t/imap-support-for-group-inboxes/160588">Discourse Meta の機能に関するお知らせ</a>」をご覧ください。'
           imap_alpha_warning: "警告: これはアルファステージの機能です。Gmail のみが公式にサポートされています。自己責任でご利用ください！"
           imap_settings_valid: "IMAP の設定は有効です。"
           smtp_disable_confirm: "SMTP を無効にすると、すべての SMTP と IMAP の設定がリセットされ、関連付けられている機能が無効になります。続行してもよろしいですか？"
@@ -709,8 +709,6 @@ ja:
         public: "公開"
         private: "非公開"
         public_groups: "公開グループ"
-        automatic_group: 自動作成グループ
-        close_group: クローズされたグループ
         my_groups: "自分のグループ"
         group_type: "グループのタイプ"
         is_group_user: "メンバー"
@@ -786,6 +784,11 @@ ja:
       flair_type:
         icon: "アイコンを選択する"
         image: "画像をアップロードする"
+      default_notifications:
+        modal_title: "ユーザーのデフォルト通知"
+        modal_description: "この変更を過去に適用しますか？これにより、既存の %{count} 人のユーザーの設定が変更されます。"
+        modal_yes: "はい"
+        modal_no: "いいえ。今後のみに変更を適用する"
     user_action_groups:
       "1": "「いいね！」した数"
       "2": "「いいね！」された数"
@@ -815,7 +818,6 @@ ja:
       posts: "投稿"
       topics: "トピック"
       latest: "最新"
-      toggle_ordering: "カテゴリの並び替えモードを切り替え"
       subcategories: "サブカテゴリ"
       muted: "ミュートされたカテゴリ"
       topic_sentence:
@@ -937,7 +939,7 @@ ja:
       dismiss_notifications_tooltip: "すべての未読の通知を既読にします"
       no_messages_title: "メッセージはありません"
       no_messages_body: >
-        通常の会話から外れて、誰かと個人的に直接話す必要がありますか？相手のアバターを選択して、%{icon} メッセージボタンを使うと、その人にメッセージを送信できます。<br><br> ヘルプが必要な場合は、<a href='%{aboutUrl}'>スタッフメンバーにメッセージを送信</a>してください。
+        通常の会話の外で、誰かと直接個人的に話す必要がありますか？相手のアバターを選択して、%{icon} メッセージボタンを使うと、その人にメッセージを送信できます。<br><br> ヘルプが必要な場合は、<a href='%{aboutUrl}'>スタッフメンバーにメッセージを送信</a>してください。
       no_bookmarks_title: "まだ何もブックマークしていません"
       no_bookmarks_body: >
         %{icon} ボタンを使って投稿をブックマークしましょう。すぐに参照できるように、ここに一覧表示されます。リマインダーもスケジュール設定可能です！
@@ -1260,7 +1262,6 @@ ja:
         browser_active: '%{browser} | <span class="active">現在アクティブ</span>'
         browser_last_seen: "%{browser} | %{date}"
       last_posted: "最後の投稿"
-      last_emailed: "最終メール送信日"
       last_seen: "アクセス"
       created: "参加日"
       log_out: "ログアウト"
@@ -1277,7 +1278,7 @@ ja:
         larger: "大"
         largest: "最大"
       title_count_mode:
-        title: "背景ページのタイトルに表示する件数:"
+        title: "バックグラウンドのページのタイトルに表示する件数:"
         notifications: "新しい通知"
         contextual: "新しいページのコンテンツ"
       like_notification_frequency:
@@ -1338,7 +1339,7 @@ ja:
         redeemed_tab: "承諾済み"
         redeemed_tab_with_count: "承諾済み (%{count})"
         invited_via: "招待状"
-        invited_via_link: "リンク %{key} (%{count}/%{max} 承諾済み)"
+        invited_via_link: "リンク %{key} (%{count}/%{max} 引き換え済み)"
         groups: "グループ"
         topic: "トピック"
         sent: "作成日/最終送信日"
@@ -1404,7 +1405,7 @@ ja:
           none: "このページに表示する招待はありません。"
           text: "一括招待"
           instructions: |
-            <p>コミュニティをすばやく拡大するには、ユーザーのリストを招待します。招待するユーザーンおメールアドレスごとに少なくとも 1 行を含む <a href="https://en.wikipedia.org/wiki/Comma-separated_values" target="_blank">CSV ファイル</a>を準備してください。カンマ区切りの情報は、グループに人を追加したい場合、またはそれらのユーザーが初めてサインインしたときに特定のトピックに移動させる場合に利用できます。</p>
+            <p>コミュニティをすばやく拡大するには、ユーザーのリストを招待します。招待するユーザーのメールアドレスごとに少なくとも 1 行を含む <a href="https://en.wikipedia.org/wiki/Comma-separated_values" target="_blank">CSV ファイル</a>を準備してください。カンマ区切りの情報は、グループに人を追加したい場合、またはそれらのユーザーが初めてサインインしたときに特定のトピックに移動させる場合に利用できます。</p>
             <pre>john@smith.com,first_group_name;second_group_name,topic_id</pre>
             <p>アップロードされる CSV ファイルに含まれるメールアドレスに招待状が送られ、後で管理することができます。</p>
           progress: "%{progress}% アップロード済み..."
@@ -1474,7 +1475,7 @@ ja:
       flair:
         title: "フレア"
         none: "(なし)"
-        instructions: "プロファイル写真の横に表示されるアイコン"
+        instructions: "プロフィール写真の横に表示されるアイコン"
       primary_group:
         title: "プライマリーグループ"
         none: "(なし)"
@@ -1859,8 +1860,8 @@ ja:
       collapse: "コンポーザーパネルを最小化"
       open: "コンポーザーパネルを開く"
       abandon: "コンポーザーを閉じて下書きを破棄"
-      enter_fullscreen: "全画面コンポーザーを開始"
-      exit_fullscreen: "全画面コンポーザーを終了"
+      enter_fullscreen: "コンポーザーの全画面表示を開始"
+      exit_fullscreen: "コンポーザーの全画面表示を終了"
       show_toolbar: "コンポーザーツールバーを表示"
       hide_toolbar: "コンポーザーツールバーを非表示"
       modal_ok: "OK"
@@ -1870,7 +1871,7 @@ ja:
         title: "受信者を追加し忘れましたか？"
         body: "現時点では、このメッセージは自分にしか送信されません！"
       slow_mode:
-        error: "このトピックは低速モードです。最近投稿したばかりです。%{timeLeft} してからもう一度投稿できます。"
+        error: "このトピックは低速モードです。最近投稿したばかりです。%{timeLeft} してから投稿してください。"
       admin_options_title: "このトピックのオプションのスタッフ設定"
       composer_actions:
         reply: 返信
@@ -1885,7 +1886,7 @@ ja:
           confirm: 新しいトピックの下書きが保存されていますが、リンクトピックを作成すると上書きされます。
         reply_as_new_group_message:
           label: 新しいグループメッセージとして返信
-          desc: 同じ受信者で新しい非公開メッセージを作成します
+          desc: 同じ受信者で始まる新しいメッセージを作成します
         reply_as_private_message:
           label: 新規メッセージ
           desc: 新しい個人メッセージを作成する
@@ -1902,7 +1903,7 @@ ja:
           desc: "許可されたユーザーにのみ表示されるトピックの下書きを作成します"
         toggle_topic_bump:
           label: "トピックのバンプを切り替える"
-          desc: "最新の返信日を変更せずに返信する"
+          desc: "最新の返信日を変更せずに返信します"
       reload: "再読み込み"
       ignore: "無視する"
     notifications:
@@ -1941,7 +1942,7 @@ ja:
       granted_badge: "「%{description}」をゲット！"
       topic_reminder: "<span>%{username}</span> %{description}"
       watching_first_post: "<span>新規トピック</span> %{description}"
-      membership_request_accepted: "%{group_name} のメンバーシップが承認されました"
+      membership_request_accepted: "'%{group_name}' のメンバーシップが承認されました"
       membership_request_consolidated:
         other: "'%{group_name}' の %{count} 件のオープンメンバーシップリクエスト"
       reaction: "<span>%{username}</span> %{description}"
@@ -2004,7 +2005,7 @@ ja:
       result_count:
         other: "<span class='term'>%{term}</span> の <span>%{count}%{plus} 件の結果</span>"
       title: "トピック、投稿、ユーザー、カテゴリを検索"
-      full_page_title: "トピックまたは投稿を検索"
+      full_page_title: "トピックまたは投稿の検索"
       no_results: "何も見つかりませんでした。"
       no_more_results: "検索結果は以上です。"
       post_format: "%{username} の #%{post_number}"
@@ -2065,7 +2066,7 @@ ja:
           min:
             placeholder: 最小
           max:
-            placeholder: 最ぢあ
+            placeholder: 最大
           time:
             label: 投稿時期
             before: 以前
@@ -2081,7 +2082,7 @@ ja:
     go_back: "戻る"
     not_logged_in_user: "現在のアクティビティと設定に関するユーザーの概要ページ"
     current_user: "ユーザーページに移動"
-    view_all: "すべての %{tab} を表示"
+    view_all: "すべての%{tab}を表示"
     topics:
       new_messages_marker: "最後の訪問"
       bulk:
@@ -2165,13 +2166,6 @@ ja:
       defer:
         help: "未読にする"
         title: "取り下げる"
-      feature_on_profile:
-        help: "このトピックへのリンクをユーザーカードとプロフィールに追加する"
-        title: "プロフィールの機能"
-      remove_from_profile:
-        warning: "あなたのプロフィールにはすでに注目のトピックがあります。続行すると、このトピックが既存のトピックに置き換わります。"
-        help: "ユーザープロフィールからこのトピックへのリンクを削除する"
-        title: "プロファイルから削除"
       list: "トピック"
       new: "新着トピック"
       unread: "未読"
@@ -2229,13 +2223,13 @@ ja:
           45_minutes: "45分"
           1_hour: "１時間"
           2_hours: "２時間"
-          4_hours: " 4 時間"
+          4_hours: "4 時間"
           8_hours: "8 時間"
           12_hours: "12 時間"
           24_hours: "24 時間"
           custom: "カスタム期間"
       slow_mode_notice:
-        duration: "このトピックでは次の投稿まで %{duration} お待ちください"
+        duration: "このトピックでは次の投稿まで %{duration}お待ちください"
       topic_status_update:
         title: "トピックタイマー"
         save: "タイマーをセット"
@@ -2245,7 +2239,7 @@ ja:
         publish_to: "公開先:"
         when: "公開時間:"
         time_frame_required: "時間枠を選択してください"
-        min_duration: "機関は 0 より大きくする必要があります"
+        min_duration: "期間は 0 より大きくする必要があります"
         max_duration: "期間は 20 年未満である必要があります"
       auto_update_input:
         none: "時間枠を選択してください"
@@ -2535,7 +2529,7 @@ ja:
         instructions:
           other: "<b>@%{old_user}</b> の %{count} 件の投稿に新しいオーナーを選択してください"
         instructions_without_old_user:
-          other: "%{count} 件の投稿に新しいオーナーを選択してください。"
+          other: "%{count} 件の投稿に新しいオーナーを選択してください"
       change_timestamp:
         title: "タイムスタンプを変更..."
         action: "タイムスタンプを変更"
@@ -2571,7 +2565,7 @@ ja:
       post_number: "投稿 %{number}"
       ignored: "無視したコンテンツ"
       wiki_last_edited_on: "%{dateTime}に最終編集されたウィキ"
-      last_edited_on: "%{dateTime} に最終編集された投稿"
+      last_edited_on: "%{dateTime}に最終編集された投稿"
       reply_as_new_topic: "リンクトピックとして返信"
       reply_as_new_private_message: "同じ受信者に新規メッセージとして返信する"
       continue_discussion: "%{postLink} からディスカッションを続行:"
@@ -2601,16 +2595,16 @@ ja:
         other: "この投稿との %{count} 件の返信を表示します"
       filtered_replies_viewing:
         other: "%{count} 件の返信を表示中:"
-      in_reply_to: "上位投稿を読み込む"
+      in_reply_to: "親投稿を読み込む"
       view_all_posts: "すべての投稿を表示"
       errors:
         create: "投稿を作成中にエラーが発生しました。もう一度やり直してください。"
         edit: "投稿を編集中にエラーが発生しました。もう一度やり直してください。"
         upload: "ファイルのアップロード中にエラーが発生しました。もう一度やり直してください。"
-        file_too_large: "ファイルが大きすぎます (最大サイズは %{max_size_kb} kb です)。クラウド共有サービスにアップロードしてから、そのリンクを貼り付けませんか？"
+        file_too_large: "ファイルが大きすぎます (最大サイズは %{max_size_kb} kb です)。クラウド共有サービスにアップロードしてから、そのリンクを貼り付けてはどうですか？"
         too_many_uploads: "複数のファイルを同時にアップロードすることはできません。"
         too_many_dragged_and_dropped_files:
-          other: "一度に %{count} 個のファイルまでアップロードできます。"
+          other: "一度にアップロードできるファイルは %{count} 個までです。"
         upload_not_authorized: "アップロードしようとしているファイルは許可されていません (許可されている拡張子: %{authorized_extensions})。"
         image_upload_not_allowed_for_new_user: "新規ユーザーは画像をアップロードできません。"
         attachment_upload_not_allowed_for_new_user: "新規ユーザーはファイルを添付できません。"
@@ -2621,12 +2615,10 @@ ja:
         save_draft: "後で使用するために下書きとして保存"
         keep_editing: "編集を続ける"
       via_email: "これはメールで投稿されました"
-      via_auto_generated_email: "この投稿は自動生成メールで届きました"
+      via_auto_generated_email: "この投稿は自動生成メール経由で届きました"
       whisper: "この投稿はモデレーターの非公開のささやきです"
       wiki:
         about: "この投稿はウィキです"
-      archetypes:
-        save: "保存オプション"
       few_likes_left: "愛を共有してくれてありがとう！今日は後数個しか「いいね！」できません。"
       controls:
         reply: "この投稿の返信を作成する"
@@ -2739,6 +2731,7 @@ ja:
         name: "名前"
         name_placeholder: "これは何のブックマークですか？"
         set_reminder: "リマインダー"
+        options: "オプション"
         actions:
           delete_bookmark:
             name: "ブックマークを削除"
@@ -2755,11 +2748,10 @@ ja:
       filtered_replies:
         viewing_posts_by: "次の投稿者の %{post_count} 件の投稿を閲覧中"
         viewing_subset: "一部の返信は折りたたまれています"
-        viewing_summary: "このトピックの要約を表示しています"
+        viewing_summary: "このトピックの要約を表示中"
         post_number: "%{username}、投稿 #%{post_number}"
         show_all: "すべて表示"
     category:
-      can: "できること&hellip; "
       none: "(カテゴリなし)"
       all: "すべてのカテゴリ"
       choose: "カテゴリ&hellip;"
@@ -2793,7 +2785,6 @@ ja:
       save_error: カテゴリを保存中にエラーが発生しました。
       name: "カテゴリ名"
       description: "説明"
-      topic: "カテゴリトピック"
       logo: "カテゴリのロゴの画像"
       background_image: "カテゴリの背景画像"
       badge_colors: "バッジの色"
@@ -2819,7 +2810,7 @@ ja:
         toggle_reply: "返信権限の切り替え"
         toggle_full: "作成権限の切り替え"
         inherited: 'この権限は "全員" から継承されます'
-      special_warning: "警告: このカテゴリは事前にシードされたカテゴリであるため、セキュリティ設定を編集できません。このカテゴリを使用しない場合は、転用せずに削除してください。"
+      special_warning: "警告: このカテゴリは事前作成されたカテゴリであるため、セキュリティ設定を編集できません。このカテゴリを使用しない場合は、転用せずに削除してください。"
       uncategorized_security_warning: "このカテゴリは特殊です。カテゴリのないトピックを保存するために用意されているため、セキュリティを設定できません。"
       uncategorized_general_warning: 'このカテゴリは特殊です。カテゴリが選択されていない新しいトピックのデフォルトのカテゴリとして使用されます。この動作を適用せずにカテゴリの選択を強制するには、<a href="%{settingLink}">ここで設定を無効にしてください</a>。名前または説明を変更するには、<a href="%{customizeLink}">カスタマイズ/テキストコンテンツ</a>に移動してください。'
       pending_permission_change_alert: "このカテゴリに %{group} を追加していません。このボタンをクリックして追加してください。"
@@ -2832,13 +2823,13 @@ ja:
       show_subcategory_list: "このカテゴリのトピックの上にサブカテゴリのリストを表示します。"
       read_only_banner: "ユーザーがこのカテゴリにトピックを作成できない場合のバナーテキスト:"
       num_featured_topics: "カテゴリページに表示するトピック数:"
-      subcategory_num_featured_topics: "上位カテゴリのページに掲載する注目のトピック数:"
+      subcategory_num_featured_topics: "親カテゴリのページに掲載する注目のトピック数:"
       all_topics_wiki: "デフォルトで新しいトピックをウィキにする"
       allow_unlimited_owner_edits_on_first_post: "最初の投稿へのオーナーによる無制限の編集を許可する"
       subcategory_list_style: "サブカテゴリのリストのスタイル:"
       sort_order: "トピックリストの並べ替え順:"
       default_view: "デフォルトのトピックリスト:"
-      default_top_period: "デフォルトの上位の期間:"
+      default_top_period: "デフォルトのトップの期間:"
       default_list_filter: "デフォルトのリストのフィルタ:"
       allow_badges_label: "このカテゴリでバッジの付与を許可する"
       edit_permissions: "権限を編集"
@@ -2854,7 +2845,7 @@ ja:
       minimum_required_tags: "トピックに必要なタグの最小数:"
       parent: "親カテゴリ"
       num_auto_bump_daily: "毎日自動的にバンプするオープントピックの数:"
-      navigate_to_first_post_after_read: "トピックが読まれた後最初の東欧に移動する"
+      navigate_to_first_post_after_read: "トピックが読まれた後最初の投稿に移動する"
       notifications:
         watching:
           title: "ウォッチ中"
@@ -3075,8 +3066,8 @@ ja:
         this_month: "今月"
         this_week: "今週"
         today: "今日"
-        other_periods: "上を参照:"
-    browser_update: '残念な我愛羅、<a href="https://www.discourse.org/faq/#browser">あなたのブラウザは古すぎるため、このサイトを処理できません</a>。リッチコンテンツを表示するには<a href="https://browsehappy.com">ブラウザをアップグレード</a>してからログインして、返信してください。'
+        other_periods: "人気を参照:"
+    browser_update: '残念ながら、<a href="https://www.discourse.org/faq/#browser">あなたのブラウザは古すぎるため、このサイトを処理できません</a>。リッチコンテンツを表示するには<a href="https://browsehappy.com">ブラウザをアップグレード</a>してからログインして、返信してください。'
     permission_types:
       full: "作成 / 返信 / 閲覧"
       create_post: "返信 / 閲覧"
@@ -3128,13 +3119,13 @@ ja:
         show_incoming_updated_topics: "%{shortcut} 更新されたトピックを表示する"
         search: "%{shortcut} 検索"
         help: "%{shortcut} キーボードヘルプを表示する"
-        dismiss_new: "%{shortcut} 新規と閉じる"
+        dismiss_new: "%{shortcut} 新規を閉じる"
         dismiss_topics: "%{shortcut} トピックを閉じる"
         log_out: "%{shortcut} ログアウト"
       composing:
         title: "作成"
-        return: "%{shortcut}コンポーザーに戻る"
-        fullscreen: "%{shortcut} コンポーザーを全画面モードにする"
+        return: "%{shortcut} コンポーザーに戻る"
+        fullscreen: "%{shortcut} コンポーザーを全画面表示にする"
       bookmarks:
         title: "ブックマークの設定"
         enter: "%{shortcut} 保存して閉じる"
@@ -3168,12 +3159,12 @@ ja:
         mark_tracking: "%{shortcut} トピックを追跡"
         mark_watching: "%{shortcut} トピックをウォッチ"
         print: "%{shortcut} トピックを印刷"
-        defer: "%{shortcut} トピックを延期"
+        defer: "%{shortcut} トピックを未読にする"
         topic_admin_actions: "%{shortcut} トピックの管理者アクションを開く"
       search_menu:
         title: "検索メニュー"
         prev_next: "%{shortcut} 選択を上下に移動"
-        insert_url: "%{shortcut} 開いているコンポーザーに選択を挿入する"
+        insert_url: "%{shortcut} 開いたコンポーザーに選択を挿入する"
     badges:
       earned_n_times:
         other: "このバッジを %{count} 回獲得しました"
@@ -3187,7 +3178,7 @@ ja:
       more_badges:
         other: "他 %{count}"
       granted:
-        other: "%{count} 回付与"
+        other: "%{count} 個付与"
       select_badge_for_title: タグラインとして使用するバッジを選択
       none: "(なし)"
       successfully_granted: "%{badge} を %{username} に正常に付与しました"
@@ -3202,7 +3193,7 @@ ja:
           name: その他
         posting:
           name: 投稿
-      favorite_max_reached: "これ以上バッジをお気に入りにできません。"
+      favorite_max_reached: "これ以上のバッジをお気に入りにできません。"
       favorite_max_not_reached: "このバッジをお気に入りにする"
       favorite_count: "%{count}/%{max} 個のバッジがお気に入りに登録されています"
     tagging:
@@ -3214,7 +3205,7 @@ ja:
       tags: "タグ"
       choose_for_topic: "オプションのタグ"
       info: "情報"
-      default_info: "このタグはどのが手ごりにも制限されておらず、同義語もありません。制限を追加するには、このタグを<a href=%{basePath}/tag_groups>タググループ</a>に追加してください。"
+      default_info: "このタグはどのカテゴリにも制限されておらず、同義語もありません。制限を追加するには、このタグを<a href=%{basePath}/tag_groups>タググループ</a>に追加してください。"
       category_restricted: "このタグは、アクセス権限のないカテゴリに制限されています。"
       synonyms: "同義語"
       synonyms_description: "次のタグが使用されている場合、<b>%{base_tag_name}</b> に置き換えられます。"
@@ -3346,6 +3337,8 @@ ja:
         regular: "レギュラー"
         leader: "リーダー"
       detailed_name: "%{level}: %{name}"
+    pick_files_button:
+      unsupported_file_picked: "サポートされていないファイルを選択しました。サポートされているファイルタイプ – %{types}。"
   admin_js:
     type_to_filter: "フィルタの種類..."
     admin:
@@ -3387,8 +3380,8 @@ ja:
         private_messages_short: "メッセージ"
         private_messages_title: "メッセージ"
         mobile_title: "モバイル"
-        space_used: "%{usedSize} 使用中"
-        space_used_and_free: "%{usedSize} (%{freeSize} 空き)"
+        space_used: "使用中: %{usedSize}"
+        space_used_and_free: "%{usedSize} (未使用: %{freeSize})"
         uploads: "アップロード"
         backups: "バックアップ"
         backup_count:
@@ -3414,7 +3407,7 @@ ja:
         exception_error: クエリを実行中にエラーが発生しました
         too_many_requests: このアクションの実行回数が多すぎます。しばらくしてからもう一度お試しください。
         not_found_error: このレポートは存在しません
-        filter_reports: レポートのフィルタ
+        filter_reports: レポートをフィルタ
         reports:
           trend_title: "%{percent} 変更。現在 %{current}、前の期間中 %{prev}。"
           today: "今日"
@@ -3439,7 +3432,7 @@ ja:
           total: "全期間合計"
           no_data: "表示するデータはありません。"
           trending_search:
-            more: '<a href="%{basePath}/admin/logs/search_logs">ログの検索</a>'
+            more: '<a href="%{basePath}/admin/logs/search_logs">検索ログ</a>'
             disabled: 'トレンド検索レポートは無効です。データを収集するには、<a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">ログ検索クエリ</a>を有効にしてください。'
           average_chart_label: 平均
           filters:
@@ -3471,7 +3464,7 @@ ja:
             visibility_levels:
               title: "誰がこのグループを閲覧できますか？"
               public: "全員"
-              logged_on_users: "ログオンしたユーザー"
+              logged_on_users: "ログオンユーザー"
               members: "グループオーナー、メンバー、モデレーター"
               staff: "グループオーナー、モデレーター"
               owners: "グループオーナー"
@@ -3573,6 +3566,7 @@ ja:
               log_out: ユーザーのすべてのセッションをログアウトします。
               anonymize: ユーザーのアカウントを匿名化します。
               delete: ユーザーのアカウントを削除します。
+              list: ユーザーのリストを取得します。
             email:
               receive_emails: このスコープを mail-receiver と組み合わせて、受信メールを処理します。
       web_hooks:
@@ -3815,7 +3809,7 @@ ja:
           show_advanced: "高度なフィールドを表示"
           hide_advanced: "高度なフィールドを非表示"
           hide_unused_fields: "未使用のフィールドを非表示"
-          is_default: "テーマはデフォルトで有効になる"
+          is_default: "テーマはデフォルトで有効"
           user_selectable: "ユーザーがテーマを選択できる"
           color_scheme_user_selectable: "ユーザーが色スキームを選択できる"
           auto_update: "Discourse が更新された時に自動更新する"
@@ -3838,7 +3832,7 @@ ja:
           disabled_component_tooltip: "このコンポーネントは削除されています"
           default_theme_tooltip: "このテーマはサイトのデフォルトのテーマです"
           updates_available_tooltip: "このテーマの更新があります"
-          and_x_more: "と他 %{count} 件。"
+          and_x_more: "と他 %{count} 個。"
           collapse: 折りたたむ
           uploads: "アップロード"
           no_uploads: "フォントや画像など、テーマに関連するアセットをアップロードできます"
@@ -3859,7 +3853,7 @@ ja:
           css_html: "カスタム CSS/HTML"
           edit_css_html: "CSS/HTML を編集"
           edit_css_html_help: "CSS または HTML を編集していません"
-          delete_upload_confirm: "個のアップロードを削除しますか？(テーマの CSS が動作しなくなる可能性があります！)"
+          delete_upload_confirm: "このアップロードを削除しますか？(テーマの CSS が動作しなくなる可能性があります！)"
           component_on_themes: "これらのテーマにコンポーネントを含める"
           included_components: "含まれているコンポーネント"
           add_all: "すべてを追加"
@@ -4167,8 +4161,8 @@ ja:
             revoke_email: "メールを取り消し"
             lock_trust_level: "信頼レベルをロック"
             unlock_trust_level: "信頼レベルをロック解除"
-            activate_user: "ユーザーをアクティブ化"
-            deactivate_user: "ユーザーを非アクティブ化"
+            activate_user: "ユーザーを有効化"
+            deactivate_user: "ユーザーを無効化"
             change_readonly_mode: "閲覧専用モードに変更"
             backup_download: "バックアップのダウンロード"
             backup_destroy: "バックアップの消去"
@@ -4193,7 +4187,7 @@ ja:
             web_hook_create: "Webhook を作成"
             web_hook_update: "Webhook を更新"
             web_hook_destroy: "Webhook を消去"
-            web_hook_deactivate: "Webhook を非アクティブ化"
+            web_hook_deactivate: "Webhook を無効化"
             embeddable_host_create: "埋め込み可能なホストを作成"
             embeddable_host_update: "埋め込み可能なホストを更新"
             embeddable_host_destroy: "埋め込み可能なホストを消去"
@@ -4271,7 +4265,7 @@ ja:
           other: "%{count} 語を表示"
         download: ダウンロード
         clear_all: すべてクリア
-        clear_all_confirm: "%{action}アクションのすべてのウォッチ中の語をクリアしてもよろしいですか？"
+        clear_all_confirm: "%{action}アクションのすべてのウォッチ語をクリアしてもよろしいですか？"
         invalid_regex: 'ウォッチ語 "%{word}" は無効な正規表現です。'
         regex_warning: '<a href="%{basePath}/admin/site_settings/category/all_results?filter=watched%20words%20regular%20expressions%20">ウォッチ語は正規表現</a>で、語の境界は自動的に含まれることはありません。全語に一致する正規表現が必要な場合は、正規表現の最初と最後に <code>\b</code> を含めます。'
         actions:
@@ -4291,7 +4285,7 @@ ja:
           replace: "投稿内の語を他の語に置き換えます"
           tag: "最初の投稿に基づいてトピックに自動的にタグを付けます"
           silence: "これらの語を含むユーザーの最初の投稿には、表示される前とユーザーが自動的に投稿禁止になる前にスタッフによる承認が必要です。"
-          link: "投稿内の語をリンクに置き換えます"
+          link: "投稿内の語をリンクに置き換える"
         form:
           label: "語またはフレーズがある"
           placeholder: "語またはフレーズを入力してください (* はワイルカード)"
@@ -4308,8 +4302,8 @@ ja:
           upload_successful: "アップロードが成功し、言葉が追加されました。"
         test:
           button_label: "テスト"
-          modal_title: "%{action}: ウォッチ中の語をテスト"
-          description: "テキストを入力して、ウォッチ中の語に一致しているかどうかを確認します"
+          modal_title: "%{action}: ウォッチ語をテスト"
+          description: "テキストを入力して、ウォッチ語に一致しているかどうかを確認します"
           found_matches: "見つかった一致:"
           no_matches: "一致する項目が見つかりませんでした"
       impersonate:
@@ -4369,7 +4363,7 @@ ja:
           consuming_staff_time: "スタッフの時間を不当に消耗したため"
           combative: "好戦的過ぎるため"
           in_wrong_place: "場所が誤っているため"
-          no_constructive_purpose: "コミュニティ内で威儀を唱える以外に建設的な目的がないため"
+          no_constructive_purpose: "コミュニティ内で異議を唱える以外に建設的な目的がないため"
           custom: "カスタム..."
         suspend_message: "メールメッセージ"
         suspend_message_placeholder: "必要に応じて、凍結に関する詳細な情報を入力し、ユーザーにメールで送信することができます。"
@@ -4393,6 +4387,7 @@ ja:
         penalty_post_edit: "投稿を編集する"
         penalty_post_none: "何もしない"
         penalty_count: "ペナルティ数"
+        penalty_history: "ペナルティ履歴"
         clear_penalty_history:
           title: "ペナルティ履歴をクリア"
           description: "ペナルティのあるユーザーは TL3 に昇格されません"
@@ -4449,7 +4444,7 @@ ja:
         delete: "ユーザーを削除"
         delete_posts:
           progress:
-            title: "投稿の削除の進捗状況"
+            title: "投稿の削除状況"
         merge:
           button: "マージ"
           prompt:
@@ -4523,6 +4518,9 @@ ja:
         trust_level_unlocked_tip: "信頼レベルのロックは解除されています。システムがユーザーを昇格または降格することがあります"
         lock_trust_level: "信頼レベルをロック"
         unlock_trust_level: "信頼レベルをロック解除"
+        silenced_count: "投稿禁止"
+        suspended_count: "凍結"
+        last_six_months: "過去 6 か月"
         tl3_requirements:
           title: "信頼レベル 3 の要件"
           table_title:
@@ -4620,7 +4618,7 @@ ja:
         none: "なし"
       site_settings:
         emoji_list:
-          invalid_input: "絵文字リストには、有効な絵文字名のみを含める必要があります。例: ハグ"
+          invalid_input: "絵文字リストには、有効な絵文字名のみを含める必要があります。例: hugs"
           add_emoji_button:
             label: "絵文字を追加"
         title: "設定"
@@ -4762,8 +4760,11 @@ ja:
           perform: "ユーザーにバッジを授与"
           upload_csv: ユーザーのメールまたはユーザー名が含まれる CSV をアップロード
           aborted: ユーザーのメールまたはユーザー名が含まれる CSV をアップロードしてください
-          success: CSV を受信しました。間もなくユーザーにバッジが授与されます。
+          success: CSV を受信しました。間もなく %{count} 人のユーザーにバッジが授与されます。
+          csv_has_unmatched_users: "次のエントリは CSV ファイルにありますが、既存のユーザーと照合できませんでした。そのため、バッジは授与されません:"
+          csv_has_unmatched_users_truncated_list: "CSV ファイルに、既存のユーザーに照合できないエントリが %{count} 件あったため、バッジは授与されません。照合されなかったエントリが多数あるため、最初の 100 件のみが表示されています:"
           replace_owners: 以前のオーナーからバッジを削除する
+          grant_existing_holders: 既存のバッジ保有者に追加のバッジを付与する
       emoji:
         title: "絵文字"
         help: "みんなが利用できる新しい絵文字を追加します。(ヒント: 複数のファイルを一度にドラッグアンドドロップできます)"
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index 9cc33a46a4..2f4f039d77 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -196,7 +196,6 @@ ko:
     conduct: "행동 강령"
     mobile_view: "모바일 보기"
     desktop_view: "데스크톱 보기"
-    you: "사용자님"
     or: "또는"
     now: "방금"
     read_more: "더 보기"
@@ -279,7 +278,6 @@ ko:
       remove: "삭제"
       remove_confirmation: "이 초안을 삭제 하시겠습니까?"
       new_topic: "새 글 초안"
-      new_private_message: "새 비공개 메시지 초안"
       topic_reply: "임시 댓글"
       abandon:
         confirm: "이 항목에 대한 초안이 진행중입니다. 무엇을 하고 싶습니까?"
@@ -350,7 +348,6 @@ ko:
         type_bonus:
           name: "유형 보너스"
           title: "특정한 검토 유형에는 관리자가 보너스를 할당하여 우선 순위를 높일 수 있습니다."
-      stale_help: "이 검토 가능 항목은 다른 사람에 의해 해결되었습니다."
       claim_help:
         optional: "다른 사용자가 처리하지 못하도록 이 항목을 지정 할 수 있습니다."
         required: "항목을 검토하려면 먼저 항목을 검토 요청을 해야합니다."
@@ -709,8 +706,6 @@ ko:
         public: "공개"
         private: "비공개"
         public_groups: "공개 그룹"
-        automatic_group: 자동 그룹
-        close_group: 그룹 닫기
         my_groups: "내 그룹"
         group_type: "그룹 유형"
         is_group_user: "회원"
@@ -786,6 +781,10 @@ ko:
       flair_type:
         icon: "아이콘 선택"
         image: "이미지 업로드"
+      default_notifications:
+        modal_description: "이 변경 사항을 역사적으로 적용 하시겠습니까? 기존 사용자 %{count}의 환경 설정이 변경됩니다."
+        modal_yes: "예"
+        modal_no: "아니요, 앞으로 만 변경 사항을 적용하십시오."
     user_action_groups:
       "1": "좋아요"
       "2": "좋아요"
@@ -815,7 +814,6 @@ ko:
       posts: "게시글"
       topics: "글"
       latest: "최신"
-      toggle_ordering: "정렬 컨트롤 토글"
       subcategories: "하위 카테고리"
       muted: "뮤트된 카테고리"
       topic_sentence:
@@ -1260,7 +1258,6 @@ ko:
         browser_active: '%{browser} | <span class="active">현재 사용</span>'
         browser_last_seen: "%{browser} | %{date}"
       last_posted: "마지막 글"
-      last_emailed: "마지막 이메일"
       last_seen: "마지막 접속"
       created: "가입"
       log_out: "로그아웃"
@@ -1883,7 +1880,6 @@ ko:
           confirm: 새 글 초안이 저장되어 있으며 링크된 글을 만들면 덮어 쓰게됩니다.
         reply_as_new_group_message:
           label: 새 그룹 메시지로 답장
-          desc: 받는 사람이 같은 새 비공개 메시지 만들기
         reply_as_private_message:
           label: 새 메시지
           desc: 새 개인 메시지 쓰기
@@ -2163,13 +2159,6 @@ ko:
       defer:
         help: "읽지 않은 상태로 표시"
         title: "연기"
-      feature_on_profile:
-        help: "사용자 카드 및 프로필에 이 글에 대한 링크 추가"
-        title: "프로필 기능"
-      remove_from_profile:
-        warning: "프로필에 이미 추천 글이 있습니다. 계속하면 이 글이 기존 글을 대체합니다."
-        help: "사용자 프로필에서 이 항목에 대한 링크 제거"
-        title: "프로필에서 제거"
       list: "글"
       new: "새 글"
       unread: "읽지 않음"
@@ -2622,8 +2611,6 @@ ko:
       whisper: "이 포스트는 운영자를 위한 비공개 귓말입니다."
       wiki:
         about: "이 게시글은 위키입니다"
-      archetypes:
-        save: "옵션 저장"
       few_likes_left: "사랑을 나누어주셔서 감사합니다! 오늘 표시할 수 있는 좋아요가 얼마 남지 않았습니다."
       controls:
         reply: "이 글에 대한 답글을 작성합니다."
@@ -2736,6 +2723,7 @@ ko:
         name: "이름"
         name_placeholder: "이 북마크는 무엇입니까?"
         set_reminder: "알림"
+        options: "옵션"
         actions:
           delete_bookmark:
             name: "북마크 삭제"
@@ -2756,7 +2744,6 @@ ko:
         post_number: "%{username}, 글 #%{post_number}"
         show_all: "모두 보기"
     category:
-      can: "허용"
       none: "(카테고리 없음)"
       all: "모든 카테고리"
       choose: "카테고리&hellip;"
@@ -2790,7 +2777,6 @@ ko:
       save_error: 카테고리 저장 중 오류가 발생했습니다.
       name: "카테고리 이름"
       description: "설명"
-      topic: "카테고리 주제"
       logo: "카테고리 로고 이미지"
       background_image: "카테고리 백그라운드 이미지"
       badge_colors: "배지 색상"
@@ -4755,7 +4741,6 @@ ko:
           perform: "사용자에게 보너스 배지"
           upload_csv: 사용자 이메일 또는 사용자 이름으로 CSV 업로드
           aborted: 사용자 이메일 또는 사용자 이름이 포함 된 CSV를 업로드하십시오
-          success: CSV가 접수되었으며 사용자는 곧 배지를 받게됩니다.
           replace_owners: 이전 소유자에서 배지를 제거합니다
       emoji:
         title: "이모티콘"
diff --git a/config/locales/client.lt.yml b/config/locales/client.lt.yml
index 1035f62e06..6835b9cb60 100644
--- a/config/locales/client.lt.yml
+++ b/config/locales/client.lt.yml
@@ -258,7 +258,6 @@ lt:
     conduct: "Elgesio kodeksas"
     mobile_view: "Mobili peržiūra"
     desktop_view: "Pilna peržiūra"
-    you: "Jūs"
     or: "arba"
     now: "Ką tik"
     read_more: "skaityti daugiau"
@@ -328,7 +327,6 @@ lt:
       resume: "Grįžti"
       remove: "Pašalinti"
       new_topic: "Naujos temos juodraštis"
-      new_private_message: "Naujas privatus pranešimo juodraštis"
       topic_reply: "Atsakymo juodraštis"
     topic_count_new:
       one: "Pamatyk %{count} naują temą"
@@ -583,7 +581,6 @@ lt:
         public: "Vieša"
         private: "Privati"
         public_groups: "Viešos grupės"
-        close_group: Uždaryti grupę
         my_groups: "Mano grupės"
         group_type: "Grupės tipas"
         is_group_user: "Narys"
@@ -638,6 +635,8 @@ lt:
       flair_color_placeholder: "(Pasirinktinai) Hex spalva"
       flair_preview_icon: "Peržiūros piktograma"
       flair_preview_image: "Peržiūros paveikslėlį"
+      default_notifications:
+        modal_yes: "Taip"
     user_action_groups:
       "1": "Tau Patinka"
       "2": "Žmonėms patinka"
@@ -667,7 +666,6 @@ lt:
       posts: "Įraša"
       topics: "Temos"
       latest: "Paskutinės"
-      toggle_ordering: "perjungti išdėstimo tvarką"
       subcategories: "Subkategorijos"
       topic_sentence:
         one: "%{count} tema"
@@ -937,7 +935,6 @@ lt:
       auth_tokens:
         details: "Detalės"
       last_posted: "Paskutinis Įrašas"
-      last_emailed: "Paskutinį kartą siųstas el. laiškas"
       last_seen: "Matytas"
       created: "Prisjungė"
       log_out: "Atsijungti"
@@ -1867,8 +1864,6 @@ lt:
       whisper: "Šis įrašas yra privatus šnabždesys moderatoriams"
       wiki:
         about: "šis įrašas yra wiki"
-      archetypes:
-        save: "Išsaugoti nustatymus"
       controls:
         reply: "Pradėk rašyti atsakymą šiam įrašui"
         like: "įrašas man patinka"
@@ -1952,8 +1947,8 @@ lt:
       bookmarks:
         created: "Sukurta"
         name: "Vardas"
+        options: "Nustatymai"
     category:
-      can: "galimas&hellip;"
       none: "(jokia kategorija)"
       all: "Visos kategorijos"
       choose: "category&hellip;"
@@ -1973,7 +1968,6 @@ lt:
       save_error: Įvyko klaida išsaugant kategoriją.
       name: "Kategorijos pavadinimas"
       description: "Aprašymas"
-      topic: "kategorijos tema"
       logo: "Kategorijos logotipo paveiksliukas"
       background_image: "Kategorijos fono paveiksliukas"
       badge_colors: "Ženkliukų spalvos"
diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml
index a2b1d90bfd..94608da239 100644
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@@ -203,7 +203,6 @@ lv:
     rules: "Noteikumi"
     mobile_view: "Mobilais skats"
     desktop_view: "Datora skats"
-    you: "Tu"
     or: "vai"
     now: "tikko"
     read_more: "lasīt vairāk"
@@ -466,7 +465,6 @@ lv:
         closed: "Slēgts"
         public: "Publisks"
         private: "Privāts"
-        automatic_group: Automātiska grupa
         my_groups: "Manas grupas"
       title:
         zero: "Grupas"
@@ -508,6 +506,8 @@ lv:
       flair_color_placeholder: "(Neobligāti) Heksadecimālā krāsas vērtība"
       flair_preview_icon: "Priekšskatījuma ikona"
       flair_preview_image: "Priekšskatījuma attēls"
+      default_notifications:
+        modal_yes: "Jā"
     user_action_groups:
       "1": "Veiktās atzinības"
       "2": "Saņemtās atzinības"
@@ -537,7 +537,6 @@ lv:
       posts: "Raksti"
       topics: "Tēmas"
       latest: "Jaunākie"
-      toggle_ordering: "mainīt secības kontroli"
       subcategories: "Apakšsadaļas"
       topic_sentence:
         zero: "Nav tēmu"
@@ -788,7 +787,6 @@ lv:
       auth_tokens:
         details: "Detaļas"
       last_posted: "Pēdējais ieraksts"
-      last_emailed: "Pēdējais e-pasts"
       last_seen: "Redzēts"
       created: "Pievienojās"
       log_out: "Iziet"
@@ -1689,8 +1687,6 @@ lv:
       whisper: "šis ieraksts ir privāts čuksts moderatoriem"
       wiki:
         about: "šis ieraksts ir wiki"
-      archetypes:
-        save: "Saglabāšanas iespējas"
       few_likes_left: "Paldies par dalīšanos ar atzinību! Jums šodien ir palikušas tikai dažas iespējas izteikt atzinību."
       controls:
         reply: "sākt rakstīt atbildi šim ierakstam"
@@ -1762,8 +1758,8 @@ lv:
       bookmarks:
         created: "Radīts"
         name: "Vārds"
+        options: "Iespējas"
     category:
-      can: "var&hellip;"
       none: "(nav sadaļas)"
       all: "Visas sadaļas"
       edit: "Labot"
@@ -1782,7 +1778,6 @@ lv:
       save_error: Saglabājot šo sadaļu, notika kļūda.
       name: "Sadaļas nosaukums"
       description: "Apraksts"
-      topic: "sadaļas tema"
       logo: "Sadaļas logo attēls"
       background_image: "Sadaļas fona attēls"
       badge_colors: "Žetona krāsas"
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 4921d1f05a..d5db8c00fd 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -201,7 +201,6 @@ nb_NO:
     rules: "Regler"
     mobile_view: "Mobilvisning"
     desktop_view: "Skrivebordsvisning"
-    you: "Du"
     or: "eller"
     now: "akkurat nå"
     read_more: "les mer"
@@ -259,7 +258,6 @@ nb_NO:
       resume: "Fortsett"
       remove: "Fjern"
       new_topic: "Nytt emneutkast"
-      new_private_message: "Nytt privat emneutkast"
       topic_reply: "Svarutkast"
     topic_count_latest:
       one: "Se %{count} nytt eller oppdatert emne"
@@ -537,8 +535,6 @@ nb_NO:
         public: "Offentlig"
         private: "Privat"
         public_groups: "Offentlige grupper"
-        automatic_group: Automatisk gruppe
-        close_group: Lukk gruppe
         my_groups: "Mine grupper"
         group_type: "Gruppetype"
         is_group_user: "Medlem"
@@ -594,6 +590,8 @@ nb_NO:
       flair_color_placeholder: "(Valgfritt) Fargekode som hex-verdi"
       flair_preview_icon: "Forhåndsvis ikon"
       flair_preview_image: "Forhåndsvis bilde"
+      default_notifications:
+        modal_yes: "Ja"
     user_action_groups:
       "1": "Likes tildelt"
       "2": "Likes mottatt"
@@ -623,7 +621,6 @@ nb_NO:
       posts: "Innlegg"
       topics: "Emner"
       latest: "Siste"
-      toggle_ordering: "slå på/av styring av sortering"
       subcategories: "Underkategorier"
       topic_sentence:
         one: "%{count} emne"
@@ -898,7 +895,6 @@ nb_NO:
       auth_tokens:
         details: "Detaljer"
       last_posted: "Siste innlegg"
-      last_emailed: "Sist kontaktet"
       last_seen: "Sist sett"
       created: "Medlem fra"
       log_out: "Logg ut"
@@ -1907,8 +1903,6 @@ nb_NO:
       whisper: "dette innlegget er et privat hvisken for moderatorer"
       wiki:
         about: "dette innlegget er en wiki"
-      archetypes:
-        save: "Lagre alternativene"
       few_likes_left: "Takk for at du gir likes! Du vil nå grensen for antall ting du kan like i dag ganske snart."
       controls:
         reply: "begynn å skrive et svar til dette innlegget"
@@ -2004,8 +1998,8 @@ nb_NO:
       bookmarks:
         created: "Opprettet"
         name: "Navn"
+        options: "Alternativer"
     category:
-      can: "kan&hellip;"
       none: "(no category)"
       all: "Alle kategorier"
       choose: "kategori&hellip;"
@@ -2028,7 +2022,6 @@ nb_NO:
       save_error: Det oppstod en feil ved lagrinen av denne kategorien.
       name: "Kategorinavn"
       description: "Beskrivelse"
-      topic: "kategoriemne"
       logo: "Kategoribilde"
       background_image: "Kategoriens bakgrunnsbilde"
       badge_colors: "Merkefarger"
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index 1439dcdcc8..f6f4592515 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -220,7 +220,6 @@ nl:
     conduct: "Gedragscode"
     mobile_view: "Mobiele weergave"
     desktop_view: "Desktopweergave"
-    you: "U"
     or: "of"
     now: "zojuist"
     read_more: "meer lezen"
@@ -302,7 +301,6 @@ nl:
       remove: "Verwijderen"
       remove_confirmation: "Weet u zeker dat u dit concept wilt verwijderen?"
       new_topic: "Nieuw-topicconcept"
-      new_private_message: "Nieuw-privéberichtconcept"
       topic_reply: "Conceptantwoord"
       abandon:
         confirm: "U hebt een concept in uitvoering voor dit topic. Wat wilt u er mee doen?"
@@ -722,8 +720,6 @@ nl:
         public: "Openbaar"
         private: "Privé"
         public_groups: "Openbare groepen"
-        automatic_group: Automatische groep
-        close_group: Besloten groep
         my_groups: "Mijn groepen"
         group_type: "Groepstype"
         is_group_user: "Lid"
@@ -800,6 +796,10 @@ nl:
       flair_type:
         icon: "Een pictogram selecteren"
         image: "Een afbeelding uploaden"
+      default_notifications:
+        modal_description: "Wilt u deze wijziging op het verleden toepassen? Hierdoor worden voor %{count} bestaande gebruikers voorkeuren gewijzigd."
+        modal_yes: "Ja"
+        modal_no: "Nee, wijziging alleen vanaf nu toepassen"
     user_action_groups:
       "1": "Gegeven likes"
       "2": "Ontvangen likes"
@@ -829,7 +829,6 @@ nl:
       posts: "Berichten"
       topics: "Topics"
       latest: "Nieuwste"
-      toggle_ordering: "sorteermethode omschakelen"
       subcategories: "Subcategorieën"
       muted: "Genegeerde categorieën"
       topic_sentence:
@@ -1277,7 +1276,6 @@ nl:
         browser_active: '%{browser} | <span class="active">nu actief</span>'
         browser_last_seen: "%{browser} | %{date}"
       last_posted: "Laatste bericht"
-      last_emailed: "Laatst gemaild"
       last_seen: "Gezien"
       created: "Lid sinds"
       log_out: "Afmelden"
@@ -1917,7 +1915,6 @@ nl:
           confirm: U hebt een nieuw-topicconcept opgeslagen, dat wordt overschreven als u een gekoppeld topic maakt.
         reply_as_new_group_message:
           label: Antwoorden als nieuw groepsbericht
-          desc: Een nieuw privébericht maken met dezelfde ontvangers
         reply_as_private_message:
           label: Nieuw bericht
           desc: Een nieuw persoonlijk bericht maken
@@ -2202,13 +2199,6 @@ nl:
       defer:
         help: "Markeren als ongelezen"
         title: "Negeren"
-      feature_on_profile:
-        help: "Een koppeling naar dit topic toevoegen op uw gebruikerskaart en profiel"
-        title: "Aanbevelen op profiel"
-      remove_from_profile:
-        warning: "Uw profiel heeft al een aanbevolen topic. Als u doorgaat, vervangt dit topic het bestaande topic."
-        help: "De koppeling naar dit topic op uw gebruikersprofiel verwijderen"
-        title: "Verwijderen uit profiel"
       list: "Topics"
       new: "nieuw topic"
       unread: "ongelezen"
@@ -2677,8 +2667,6 @@ nl:
       whisper: "dit bericht is alleen toegankelijk voor moderators"
       wiki:
         about: "dit bericht is een wiki"
-      archetypes:
-        save: "Opties opslaan"
       few_likes_left: "Bedankt voor uw steun! U kunt vandaag nog een paar likes uitdelen."
       controls:
         reply: "beginnen met opstellen van een antwoord op dit bericht"
@@ -2800,6 +2788,7 @@ nl:
         name: "Naam"
         name_placeholder: "Waar is deze bladwijzer voor?"
         set_reminder: "Mij herinneren"
+        options: "Opties"
         actions:
           delete_bookmark:
             name: "Bladwijzer verwijderen"
@@ -2820,7 +2809,6 @@ nl:
         post_number: "%{username}, bericht #%{post_number}"
         show_all: "Alles tonen"
     category:
-      can: "kan&hellip; "
       none: "(geen categorie)"
       all: "Alle categorieën"
       choose: "categorie&hellip;"
@@ -2854,7 +2842,6 @@ nl:
       save_error: Er is een fout opgetreden bij het opslaan van de categorie.
       name: "Categorienaam"
       description: "Omschrijving"
-      topic: "categorietopic"
       logo: "Afbeelding van categorielogo"
       background_image: "Achtergrondafbeelding van categorie"
       badge_colors: "Badgekleuren"
@@ -4827,7 +4814,6 @@ nl:
           perform: "Badge aan gebruikers toekennen"
           upload_csv: Een CSV met e-mailadressen of gebruikersnamen uploaden
           aborted: Upload een CSV dat e-mailadressen of gebruikersnamen bevat
-          success: Uw CSV is ontvangen en gebruikers ontvangen binnenkort hun badge.
           replace_owners: De badge van vorige eigenaren verwijderen
       emoji:
         title: "Emoji"
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index a7ad8d23ed..be57f18471 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -269,7 +269,6 @@ pl_PL:
     conduct: "Regulamin"
     mobile_view: "Widok mobilny"
     desktop_view: "Wersja komputerowa"
-    you: "Ty"
     or: "lub"
     now: "teraz"
     read_more: "więcej"
@@ -358,7 +357,7 @@ pl_PL:
       remove: "Usuń"
       remove_confirmation: "Czy na pewno chcesz usunąć ten szkic?"
       new_topic: "Nowy szkic tematu"
-      new_private_message: "Nowy szkic wiadomości prywatnej"
+      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ć?"
@@ -438,6 +437,7 @@ pl_PL:
         type_bonus:
           name: "bonus typu"
           title: "Niektóre rodzaje przeglądalne mogą otrzymać premię od pracowników, aby nadać im wyższy priorytet."
+      stale_help: "Wiadomość została już zweryfikowana przez <b>%{username}</b>."
       claim_help:
         optional: "Możesz zgłosić roszczenie do tego elementu, aby uniemożliwić innym jego sprawdzenie."
         required: "Musisz przejąć tę pozycję, zanim będziesz mógł/mogła je przejrzeć."
@@ -675,6 +675,7 @@ pl_PL:
         many: "%{count} użytkowników"
         other: "%{count} użytkowników"
       edit_columns:
+        title: "Edytuj kolumny katalogu"
         save: "Zapisz"
         reset_to_default: "Przywróć ustawienia domyślne"
       group:
@@ -736,6 +737,9 @@ pl_PL:
           imap_instructions: 'Po włączeniu protokołu IMAP dla grupy wiadomości e-mail są synchronizowane między skrzynką odbiorczą grupy a dostarczonym serwerem IMAP i skrzynką pocztową. Protokół SMTP musi być włączony przy użyciu prawidłowych i przetestowanych poświadczeń, zanim będzie można włączyć protokół IMAP. Nazwa użytkownika poczty e-mail i hasło używane do SMTP będą używane do IMAP. Aby uzyskać więcej informacji, zobacz ogłoszenie o funkcji <a target="_blank" href="https://meta.discourse.org/t/imap-support-for-group-inboxes/160588"></a>.'
           imap_alpha_warning: "Ostrzeżenie: To jest funkcja na etapie alfa. Tylko Gmail jest oficjalnie wspierany. Używaj na własne ryzyko!"
           imap_settings_valid: "Ustawienia IMAP są prawidłowe."
+          smtp_disable_confirm: "Jeśli wyłączysz SMTP, wszystkie ustawienia SMTP i IMAP zostaną zresetowane, a powiązane funkcje zostaną wyłączone. Jesteś pewien, że chcesz kontynuować?"
+          imap_disable_confirm: "Jeśli wyłączysz IMAP, wszystkie ustawienia IMAP zostaną zresetowane, a powiązane funkcje zostaną wyłączone. Jesteś pewien, że chcesz kontynuować?"
+          imap_mailbox_not_selected: "Musisz wybrać skrzynkę pocztową dla tej konfiguracji IMAP, w przeciwnym razie żadna skrzynka pocztowa nie zostanie zsynchronizowana!"
           prefill:
             title: "Wstępne wypełnienie ustawieniami dla:"
             gmail: "GMail"
@@ -834,8 +838,6 @@ pl_PL:
         public: "Publiczna"
         private: "Prywatna"
         public_groups: "Publiczne grupy"
-        automatic_group: Grupa automatyczna
-        close_group: Zamknij grupę
         my_groups: "Moje grupy"
         group_type: "Rodzaj grupy"
         is_group_user: "Członek"
@@ -914,6 +916,11 @@ pl_PL:
       flair_type:
         icon: "Wybierz ikonę"
         image: "Prześlij obraz"
+      default_notifications:
+        modal_title: "Domyślne powiadomienia użytkownika"
+        modal_description: "Czy chciałbyś wprowadzić tę zmianę wstecz? Zmieni to ustawienia %{count} istniejących użytkowników."
+        modal_yes: "Tak"
+        modal_no: "Nie, wprowadź zmianę odtąd, na przyszłość"
     user_action_groups:
       "1": "Polubienia"
       "2": "Otrzymane polubienia"
@@ -943,7 +950,6 @@ pl_PL:
       posts: "Posty"
       topics: "Tematy"
       latest: "Aktualne"
-      toggle_ordering: "przełącz kolejność kontroli"
       subcategories: "Podkategorie"
       muted: "Wyciszone kategorie"
       topic_sentence:
@@ -1079,8 +1085,14 @@ pl_PL:
       dismiss_notifications: "Odrzuć wszystkie"
       dismiss_notifications_tooltip: "Oznacz wszystkie powiadomienia jako przeczytane"
       no_messages_title: "Nie masz żadnych wiadomości"
+      no_messages_body: >
+        Potrzebujesz bezpośredniej, osobistej rozmowy z kimś, poza normalnym tokiem rozmowy? Wyślij wiadomość, wybierając awatar i używając przycisku %{icon} wiadomość.<br><br> Jeśli potrzebujesz pomocy, możesz <a href='%{aboutUrl}'>wysłać wiadomość do członka personelu</a>.
       no_bookmarks_title: "Nie masz jeszcze żadnych zakładek"
+      no_bookmarks_body: >
+        Rozpocznij zakładki za pomocą przycisku %{icon} i zostaną one wymienione tutaj w celu ułatwienia odniesienia się do nich w późniejszym czasie. Możesz też zaplanować przypomnienie!
       no_notifications_title: "Nie masz jeszcze żadnych powiadomień"
+      no_notifications_body: >
+        W tym panelu zostaniesz powiadomiony o aktywności bezpośrednio związanej z Tobą, w tym o odpowiedziach na Twoje tematy i posty, gdy ktoś <b>@oznaczy</b> lub zacytuje Cię i odpowie na obserwowane przez Ciebie tematy. Powiadomienia będą również wysyłane na Twój adres e-mail, gdy nie jesteś zalogowany przez jakiś czas. <br><br> Poszukaj %{icon} aby zdecydować, o których konkretnych tematach, kategoriach i tagach chcesz otrzymywać powiadomienia. Więcej informacji znajdziesz w <a href='%{preferencesUrl}'>preferencjach powiadomień</a>.
       first_notification: "Twoje pierwsze powiadomienie! Kliknij aby zacząć."
       dynamic_favicon: "Pokazuj liczbę nowych/zaktualizowanych tematów w ikonie przeglądarki."
       skip_new_user_tips:
@@ -1405,7 +1417,6 @@ pl_PL:
         browser_active: '%{browser} | <span class="active">aktywny teraz</span>'
         browser_last_seen: "%{browser} | %{date}"
       last_posted: "Ostatni wpis"
-      last_emailed: "Ostatnio otrzymał(a) email"
       last_seen: "Ostatnio widziano"
       created: "Dołączył"
       log_out: "Wyloguj"
@@ -1642,8 +1653,11 @@ pl_PL:
       title:
         title: "Tytuł"
         none: "(brak)"
+        instructions: "pojawia się po Twojej nazwie użytkownika"
       flair:
+        title: "Ikona"
         none: "(brak)"
+        instructions: "ikona wyświetlana obok Twojego zdjęcia profilowego"
       primary_group:
         title: "Główna grupa"
         none: "(brak)"
@@ -2096,7 +2110,7 @@ pl_PL:
           confirm: Zapisano nową wersję roboczą tematu, która zostanie zastąpiona, jeśli utworzysz połączony temat.
         reply_as_new_group_message:
           label: Odpowiedz jako nowa wiadomość grupowa
-          desc: Utwórz nową wiadomość prywatną z tymi samymi adresatami
+          desc: Utwórz nową wiadomość zaczynając od tych samych odbiorców
         reply_as_private_message:
           label: Nowa wiadomość
           desc: Utwórz nową osobistą wiadomość
@@ -2421,13 +2435,6 @@ pl_PL:
       defer:
         help: "Oznacz jako nieprzeczytane"
         title: "Zignoruj"
-      feature_on_profile:
-        help: "Dodaj link do tego tematu na karcie użytkownika i profilu"
-        title: "Funkcja na profilu"
-      remove_from_profile:
-        warning: "Twój profil ma już polecany temat. Jeśli będziesz kontynuować, ten temat zastąpi istniejący."
-        help: "Usuń link do tego tematu w swoim profilu użytkownika"
-        title: "Usuń z profilu"
       list: "Tematy"
       new: "nowy temat"
       unread: "nieprzeczytane"
@@ -2475,6 +2482,7 @@ pl_PL:
       browse_all_categories: Przeglądaj wszystkie kategorie
       browse_all_tags: Przeglądaj wszystkie tagi
       view_latest_topics: pokaż aktualne tematy
+      suggest_create_topic: Gotowy na <a href>rozpoczęcie nowej rozmowy?</a>
       jump_reply_up: skocz do wcześniejszej odpowiedzi
       jump_reply_down: skocz do późniejszej odpowiedzi
       deleted: "Temat został usunięty"
@@ -2536,6 +2544,8 @@ pl_PL:
         title: "Zaplanuj publikację"
       temp_open:
         title: "Otwórz tymczasowo"
+      auto_reopen:
+        title: "Automatyczne otwieranie tematu"
       temp_close:
         title: "Zamknij tymczasowo"
       auto_close:
@@ -2600,12 +2610,15 @@ pl_PL:
         reasons:
           mailing_list_mode: "Masz włączony tryb powiadomień mailowych, więc będziesz otrzymywał powiadomienia o nowych odpowiedziach w tym temacie za przez e-mail."
           "3_10": "Będziesz otrzymywał powiadomienia, ponieważ temat zawiera obserwowany przez Ciebie tag"
+          "3_10_stale": "Będziesz otrzymywać powiadomienia, ponieważ w przeszłości oglądałeś tag na ten temat."
           "3_6": "Będziesz otrzymywać powiadomienia o każdym nowym wpisie i temacie, ponieważ obserwujesz tę kategorię."
+          "3_6_stale": "Będziesz otrzymywać powiadomienia, ponieważ oglądałeś tę kategorię w przeszłości."
           "3_5": "Będziesz otrzymywać powiadomienia o każdym nowym wpisie, ponieważ włączono automatyczne obserwowanie tego tematu."
           "3_2": "Będziesz otrzymywać powiadomienia o każdym nowym wpisie, ponieważ obserwujesz ten temat."
           "3_1": "Będziesz otrzymywać powiadomienia, ponieważ jesteś autorem tego tematu."
           "3": "Będziesz otrzymywać powiadomienia o każdym nowym wpisie, ponieważ obserwujesz ten temat."
           "2_8": "Widzisz ilość nowych odpowiedzi, ponieważ śledzisz kategorię wątku."
+          "2_8_stale": "Zobaczysz liczbę nowych odpowiedzi, ponieważ śledziłeś tę kategorię w przeszłości."
           "2_4": "Widzisz ilość nowych odpowiedzi, ponieważ wypowiedziałeś/łaś się w tym wątku."
           "2_2": "Widzisz ilość nowych odpowiedzi, ponieważ śledzisz ten wątek."
           "2": 'Zobaczysz liczbę nowych odpowiedzi, ponieważ <a href="%{basePath}/u/%{username}/preferences/notifications">przeczytałeś/łaś ten temat</a>.'
@@ -2661,6 +2674,7 @@ pl_PL:
         pin: "Przypnij temat"
         unpin: "Odepnij temat"
         pin_globally: "Przypnij temat globalnie"
+        make_banner: "Utwórz temat bannerowy"
         remove_banner: "Wyłącz baner"
       reply:
         title: "Odpowiedz"
@@ -2952,8 +2966,6 @@ pl_PL:
       whisper: "ten wpis jest prywatnym szeptem do moderatorów"
       wiki:
         about: "ten wpis jest częścią wiki"
-      archetypes:
-        save: "Opcje zapisu"
       few_likes_left: "Dziękuję za polubienie! Pozostało Ci tylko parę polubień do wykorzystania dzisiaj"
       controls:
         reply: "zacznij tworzyć odpowiedź na ten wpis"
@@ -3093,6 +3105,7 @@ pl_PL:
         name: "Imię"
         name_placeholder: "Do czego ma służyć ta zakładka?"
         set_reminder: "Przypomnij mi"
+        options: "Opcje"
         actions:
           delete_bookmark:
             name: "Usuń zakładkę"
@@ -3113,7 +3126,6 @@ pl_PL:
         post_number: "%{username}, post #%{post_number}"
         show_all: "Pokaż wszystkie"
     category:
-      can: "może&hellip; "
       none: "(brak kategorii)"
       all: "Wszystkie kategorie"
       choose: "kategoria&hellip;"
@@ -3147,7 +3159,6 @@ pl_PL:
       save_error: Podczas zapisywania tej kategorii wystąpił błąd.
       name: "Nazwa kategorii"
       description: "Opis"
-      topic: "temat kategorii"
       logo: "Grafika z logo kategorii"
       background_image: "Grafika z tłem kategorii"
       badge_colors: "Kolor Etykiety"
@@ -3615,6 +3626,7 @@ pl_PL:
           name: Pisanie
       favorite_max_reached: "Nie możesz faworyzować więcej odznak."
       favorite_max_not_reached: "Oznacz tę odznakę jako ulubioną"
+      favorite_count: "%{count}/%{max} odznaki oznaczone jako ulubione"
     tagging:
       all_tags: "Wszystkie tagi"
       other_tags: "Inne tagi"
@@ -3624,6 +3636,7 @@ pl_PL:
       tags: "Tagi"
       choose_for_topic: "tagi opcjonalne"
       info: "Informacje"
+      default_info: "Ten tag nie jest ograniczony do żadnych kategorii i nie ma synonimów. Aby dodać ograniczenia, umieść ten tag w grupie tagów <a href=%{basePath}/tag_groups></a>."
       category_restricted: "Ten tag jest ograniczony do kategorii, do których nie masz uprawnień dostępu."
       synonyms: "Synonimy"
       synonyms_description: "W przypadku użycia następujących tagów zostaną one zastąpione przez <b>%{base_tag_name}</b>."
@@ -3709,10 +3722,15 @@ pl_PL:
           description: "Nie będziesz powiadamiany o niczym dotyczącym nowych tematów z tym tagiem i nie pojawią się na liście aktualnych."
       groups:
         title: "Tagi grup"
+        about_heading: "Wybierz grupę tagów lub utwórz nową"
+        about_heading_empty: "Aby rozpocząć, utwórz nową grupę tagów"
+        about_description: "Grupy tagów pomagają zarządzać uprawnieniami dla wielu tagów w jednym miejscu."
         new: "Nowa Grupa"
         new_title: "Utwórz nową grupę"
+        edit_title: "Edytuj grupę tagów"
         tags_label: "Tagi w tej grupie"
         parent_tag_label: "Nadrzędny tag"
+        parent_tag_description: "Tagi z tej grupy mogą być użyte tylko wtedy, gdy tag nadrzędny jest obecny."
         one_per_topic_label: "Ogranicz jeden tag na temat z tej grupy"
         new_name: "Nowa grupa tagów"
         name_placeholder: "Nazwa"
@@ -3722,6 +3740,7 @@ pl_PL:
         everyone_can_use: "Tagi mogą być wykorzystywane przez wszystkich"
         usable_only_by_groups: "Tagi są widoczne dla wszystkich, ale tylko następujące grupy mogą ich używać"
         visible_only_to_groups: "Tagi są widoczne tylko dla następujących grup"
+        cannot_save: "Nie można zapisać grupy tagów. Upewnij się, że istnieje co najmniej jeden tag, nazwa grupy tagów nie jest pusta, a grupa jest wybrana do uprawnień tagów."
         tags_placeholder: "Wyszukaj lub utwórz tagi"
         parent_tag_placeholder: "Opcjonalnie"
         select_groups_placeholder: "Wybierz grupy..."
@@ -3770,6 +3789,8 @@ pl_PL:
         regular: "zwyczajny"
         leader: "lider"
       detailed_name: "%{level}: %{name}"
+    pick_files_button:
+      unsupported_file_picked: "Wybrałeś nieobsługiwany plik. Obsługiwane typy plików – %{types}."
   admin_js:
     type_to_filter: "pisz, aby filtrować…"
     admin:
@@ -4006,6 +4027,7 @@ pl_PL:
               log_out: Wyloguj wszystkie sesje użytkownika.
               anonymize: Anonimizuj konta użytkowników.
               delete: Usuń konta użytkowników.
+              list: Uzyskaj listę użytkowników.
             email:
               receive_emails: Połącz ten zakres z odbiorcą poczty w celu przetwarzania przychodzących wiadomości e-mail.
       web_hooks:
@@ -4224,6 +4246,7 @@ pl_PL:
           theme: "Motyw"
           component: "Składnik"
           components: "Składniki"
+          filter_placeholder: "pisz, aby filtrować…"
           theme_name: "Nazwa motywu"
           component_name: "Nazwa komponentu"
           themes_intro: "Wybierz istniejący motyw lub zainstaluj nowy, by rozpocząć"
@@ -4718,6 +4741,7 @@ pl_PL:
         clear_all: Wyczyść wszystko
         clear_all_confirm: "Czy na pewno chcesz wyczyścić wszystkie obejrzane słowa dla akcji %{action}?"
         invalid_regex: 'Obserwowane słowo "%{word}" jest nieprawidłowym wyrażeniem regularnym.'
+        regex_warning: '<a href="%{basePath}/admin/site_settings/category/all_results?filter=watched%20words%20regular%20expressions%20">Obserwowane słowa są wyrażeniami regularnymi</a> i nie zawierają w sobie automatycznie granic słów. Jeśli chcesz, aby wyrażenie regularne pasowało do całych słów, dodaj <code>\b</code> na początku i na końcu wyrażenia regularnego.'
         actions:
           block: "Zablokuj"
           censor: "Cenzuruj"
@@ -4733,6 +4757,8 @@ pl_PL:
           require_approval: "Wpisy zawierające te słowa będą wymagały zatwierdzenia przez członka zespołu zarządzającego zanim zostaną opublikowane."
           flag: "Zezwalaj na publikację takich wpisów, ale oflaguj je jako nieodpowiednie, aby moderatorzy mogli przejrzeć ich zawartość."
           replace: "Zastąp słowa w postach innymi słowami"
+          tag: "Automatycznie otaguj tematy na podstawie pierwszego postu"
+          silence: "Pierwsze posty użytkowników zawierające te słowa będą wymagały zatwierdzenia przez personel, zanim będą widoczne, a użytkownik zostanie automatycznie wyciszony."
           link: "Zastąp słowa w postach linkami"
         form:
           label: "Zawiera słowo lub frazę"
@@ -4750,6 +4776,7 @@ pl_PL:
           upload_successful: "Przesyłanie zakończone sukcesem. Słowa zostały dodane."
         test:
           button_label: "Sprawdź"
+          modal_title: "%{action}: Testuj obserwowane słowa"
           description: "Wpisz tekst poniżej, aby sprawdzić dopasowania z obserwowanymi słowami"
           found_matches: "Znalezione wyniki:"
           no_matches: "Nie znaleziono dopasowań"
@@ -4808,6 +4835,7 @@ pl_PL:
         suspend_reasons:
           not_listening_to_staff: "Nie słuchał opinii personelu"
           consuming_staff_time: "Zużywał nieproporcjonalne ilości czasu personelu"
+          combative: "Zbyt wojowniczy"
           in_wrong_place: "W złym miejscu"
           no_constructive_purpose: "Nie ma żadnego konstruktywnego celu dla swoich działań z wyjątkiem tworzenia kłótni wewnątrz społeczności."
           custom: "Niestandardowy..."
@@ -5221,8 +5249,11 @@ pl_PL:
           perform: "Odznaka dla użytkowników"
           upload_csv: Prześlij plik CSV z adresami e-mail lub nazwami użytkowników
           aborted: Proszę przesłać plik CSV zawierający adresy e-mail użytkowników lub ich nazwy
-          success: Twój plik CSV został odebrany, a użytkownicy wkrótce otrzymają swoją odznakę.
+          success: Twój plik CSV został odebrany i %{count} użytkowników wkrótce otrzyma swoją plakietkę.
+          csv_has_unmatched_users: "Następujące wpisy znajdują się w pliku CSV, ale nie można ich dopasować do istniejących użytkowników, dlatego nie otrzymają plakietki:"
+          csv_has_unmatched_users_truncated_list: "W pliku CSV znalazło się %{count} wpisów, które nie mogły być dopasowane do istniejących użytkowników i dlatego nikt nie otrzyma odznaki. Ze względu na dużą liczbę niedopasowanych wpisów, wyświetlane jest tylko pierwsze 100 wpisów:"
           replace_owners: Usuń odznakę od poprzednich właścicieli
+          grant_existing_holders: Przyznaj dodatkowe odznaki obecnym posiadaczom odznak
       emoji:
         title: "Emoji"
         help: "Dodaj nowe emoji. (PROTIP: przeciągnij i upuść kilka plików na raz)"
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index e05d5c148f..d6cc2562b7 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -220,7 +220,6 @@ pt:
     conduct: "Código de Conduta"
     mobile_view: "Visualização Mobile"
     desktop_view: "Visualização Desktop"
-    you: "Você"
     or: "ou"
     now: "ainda agora"
     read_more: "ler mais"
@@ -305,7 +304,6 @@ pt:
       remove: "Remover"
       remove_confirmation: "Tem a certeza que pretende eliminar este rascunho?"
       new_topic: "Novo rascunho de tópico"
-      new_private_message: "Novo rascunho de mensagem privada"
       topic_reply: "Rascunho da resposta"
       abandon:
         confirm: "Tem um rascunho em andamento neste tópico. O que gostaria de fazer com ele?"
@@ -379,7 +377,6 @@ pt:
         type_bonus:
           name: "tipo de bónus"
           title: "Determinado tipo de revisões podem receber um bónus por parte da equipa para terem uma prioridade mais elevada."
-      stale_help: "Esta revisão foi resolvida por outra pessoa."
       claim_help:
         optional: "Pode reivindicar este item para prevenir que outras pessoas o revejam."
         required: "Deve reivindicar items antes de as poder rever."
@@ -752,8 +749,6 @@ pt:
         public: "Público"
         private: "Privado"
         public_groups: "Grupos Públicos"
-        automatic_group: Grupo Automático
-        close_group: Fechar Grupo
         my_groups: "Os Meus Grupos"
         group_type: "Tipo de grupo"
         is_group_user: "Membro"
@@ -830,6 +825,8 @@ pt:
       flair_type:
         icon: "Selecione um ícone"
         image: "Enviar uma imagem"
+      default_notifications:
+        modal_yes: "Sim"
     user_action_groups:
       "1": "Gostos Dados"
       "2": "Gostos Recebidos"
@@ -859,7 +856,6 @@ pt:
       posts: "Publicações"
       topics: "Tópicos"
       latest: "Recentes"
-      toggle_ordering: "alternar o controlo de ordenação"
       subcategories: "Subcategorias"
       muted: "Categorias silenciadas"
       topic_sentence:
@@ -1314,7 +1310,6 @@ pt:
         browser_active: '%{browser} | <span class="active">ativo agora</span>'
         browser_last_seen: "%{browser} | %{date}"
       last_posted: "Última Publicação"
-      last_emailed: "Último Enviado por Mensagem"
       last_seen: "Visto"
       created: "Juntou-se"
       log_out: "Terminar Sessão"
@@ -1929,7 +1924,6 @@ pt:
           confirm: Você tem um novo rascunho de tópico guardado que será substituído se criar um tópico ligado.
         reply_as_new_group_message:
           label: Responder como uma nova mensagem de grupo
-          desc: Criar uma nova mensagem privada com os mesmos destinatários
         reply_as_private_message:
           label: Nova mensagem
           desc: Crie uma nova mensagem privada
@@ -2224,13 +2218,6 @@ pt:
       defer:
         help: "Marcar como não lida"
         title: "Diferir"
-      feature_on_profile:
-        help: "Adicione um link para este tópico no seu cartão de usuário e perfil"
-        title: "Funcionalidade no perfil"
-      remove_from_profile:
-        warning: "O seu perfil já tem um tópico em destaque. Se você continuar, este tópico substituirá o tópico existente."
-        help: "Remover o link para este tópico no seu perfil de usuário"
-        title: "Remover do Perfil"
       list: "Tópicos"
       new: "novo tópico"
       unread: "não lido"
@@ -2699,8 +2686,6 @@ pt:
       whisper: "esta publicação é um susurro privado para os moderadores"
       wiki:
         about: "esta publicação é uma wiki"
-      archetypes:
-        save: "Guardar as Opções"
       few_likes_left: "Obrigado por partilhar o amor! Restam-lhe apenas um gostos para hoje."
       controls:
         reply: "começar a compor uma resposta a este tópico"
@@ -2809,6 +2794,7 @@ pt:
         name: "Nome"
         name_placeholder: "Para que serve este favorito?"
         set_reminder: "Me lembrar"
+        options: "Opções"
         actions:
           delete_bookmark:
             name: "Excluir favorito"
@@ -2829,7 +2815,6 @@ pt:
         post_number: "%{username}, post #%{post_number}"
         show_all: "Mostrar tudo"
     category:
-      can: "pode&hellip; "
       none: "(sem categoria)"
       all: "Todas as categorias"
       choose: "categoria&hellip;"
@@ -2863,7 +2848,6 @@ pt:
       save_error: Ocorreu um erro ao guardar a categoria.
       name: "Nome da Categoria"
       description: "Descrição"
-      topic: "tópico da categoria"
       logo: "Logótipo da Categoria"
       background_image: "Imagem de Fundo da Categoria"
       badge_colors: "Cores do crachá"
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index d7b12644ac..91169c7f15 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -41,6 +41,7 @@ pt_BR:
       long_date_without_year_with_linebreak: "D MMM <br/>LT"
       long_date_with_year_with_linebreak: "D MMM, 'YY <br/>LT"
       wrap_ago: "%{date} atrás"
+      wrap_on: "em %{date}"
       tiny:
         half_a_minute: "< 1 m"
         less_than_x_seconds:
@@ -220,7 +221,6 @@ pt_BR:
     conduct: "Código de Conduta"
     mobile_view: "VIsualização Móvel"
     desktop_view: "Visualização do Desktop"
-    you: "Você"
     or: "ou"
     now: "agora"
     read_more: "leia mais"
@@ -266,10 +266,13 @@ pt_BR:
       contact_info: "Em caso de algum problema crítico ou assunto urgente relacionado a este site, fale conosco em %{contact_info}."
     bookmarked:
       title: "Favorito"
+      edit_bookmark: "Editar favorito"
       clear_bookmarks: "Limpar favoritos"
       help:
         bookmark: "Clique para adicionar a primeira postagem deste tópico aos favoritos"
+        edit_bookmark: "Clique para editar o favorito neste tópico"
         unbookmark: "Clique para remover todos os favoritos neste tópico"
+        unbookmark_with_reminder: "Clique para remover todos os favoritos e lembretes neste tópico."
     bookmarks:
       created: "Você marcou esta postagem como favorita. %{name}"
       not_bookmarked: "marcar postagem como favorita"
@@ -302,7 +305,7 @@ pt_BR:
       remove: "Remover"
       remove_confirmation: "Tem certeza de que deseja excluir este rascunho?"
       new_topic: "Novo rascunho de tópico"
-      new_private_message: "Novo rascunho de mensagem privada"
+      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?"
@@ -376,7 +379,7 @@ pt_BR:
         type_bonus:
           name: "bônus de tipo"
           title: "Certos tipos revisáveis podem receber um bônus da equipe para aumentar sua prioridade."
-      stale_help: "Esta revisão foi solucionada por outra pessoa."
+      stale_help: "Este revisável foi encerrado por <b>%{username}</b>."
       claim_help:
         optional: "Você pode reivindicar este item para impedir que outras pessoas o revisem."
         required: "Você precisa reivindicar itens antes de poder revisá-los."
@@ -539,9 +542,12 @@ pt_BR:
       tomorrow: "Amanhã"
       post_local_date: "Data na postagem"
       later_this_week: "Mais tarde nesta semana"
+      this_weekend: "Neste fim de semana"
       start_of_next_business_week: "Segunda-feira"
       start_of_next_business_week_alt: "Próxima segunda-feira"
+      two_weeks: "Duas semanas"
       next_month: "Próximo mês"
+      six_months: "Seis meses"
       custom: "Data e hora personalizadas"
       relative: "Tempo relativo"
       none: "Nenhum necessário"
@@ -583,6 +589,7 @@ pt_BR:
         one: "%{count} usuário"
         other: "%{count} usuários"
       edit_columns:
+        title: "Editar colunas do diretório"
         save: "Salvar"
         reset_to_default: "Restaurar para padrão"
       group:
@@ -598,7 +605,12 @@ pt_BR:
       member_added: "Adicionado"
       member_requested: "Solicitado em"
       add_members:
+        title: "Adicionar usuários (a) a %{group_name}"
+        description: "Insira uma lista de usuários(as) que você quer convidar para o grupo ou cole em uma lista separada por vírgulas:"
+        usernames_placeholder: "nomes de usuário(a)"
+        usernames_or_emails_placeholder: "nomes de usuário(a) ou e-maiis"
         notify_users: "Notificar usuários"
+        set_owner: "Definir usuários(as) como proprietários(as) deste grupo"
       requests:
         title: "Solicitações"
         reason: "Motivo"
@@ -612,6 +624,8 @@ pt_BR:
         title: "Gerenciar"
         name: "Nome"
         full_name: "Nome completo"
+        add_members: "Adicionar usuários(as)"
+        invite_members: "Convidar"
         delete_member_confirm: "Remover %{username} do %{group} grupo?"
         profile:
           title: Perfil
@@ -626,6 +640,8 @@ pt_BR:
           enable_imap: "Ativar IMAP"
           test_settings: "Configurações de teste"
           save_settings: "Salvar configurações"
+          last_updated: "Última atualização:"
+          last_updated_by: "de"
           settings_required: "Todas as configurações são obrigatórias, preencha todos os campos antes de validar."
           smtp_settings_valid: "Configurações de SMTP válidas."
           smtp_title: "SMTP"
@@ -635,6 +651,12 @@ pt_BR:
           imap_instructions: 'Quando você ativa o IMAP para o grupo, os e-mails são sincronizados entre a caixa de entrada do grupo, o servidor IMAP e a caixa de mensagens fornecidos. O SMTP deve ser ativado com as credenciais válidas e testadas antes que o IMAP possa ser ativado. O nome do(a) usuário(a) e a senha de e-mail usados para o SMTP serão aplicados ao IMAP. Para obter mais informações, consulte <a target="_blank" href="https://meta.discourse.org/t/imap-support-for-group-inboxes/160588">anúncio de recursos no Discourse Meta</a>.'
           imap_alpha_warning: "Aviso: este recurso está no estágio alfa. Apenas o Gmail é oficialmente compatível. Use por sua conta e risco!"
           imap_settings_valid: "Configurações IMAP válidas."
+          smtp_disable_confirm: "Se você desativar o SMTP, todas as configurações de SMTP e IMAP serão redefinidas e os recursos correspondentes serão desativados. Tem certeza de que quer continuar?"
+          imap_disable_confirm: "Se você desativar o IMAP, todas as configurações de IMAP serão redefinidas e os recursos correspondentes serão desativados. Tem certeza de que quer continuar?"
+          imap_mailbox_not_selected: "Se você selecionar uma caixa de entrada para esta configuração IMAP ou nenhuma caixa postal será sincronizada!"
+          prefill:
+            title: "Preencher com configurações para:"
+            gmail: "Gmail"
           credentials:
             title: "Credenciais"
             smtp_server: "Servidor SMTP"
@@ -648,9 +670,11 @@ pt_BR:
           settings:
             title: "Configurações"
             allow_unknown_sender_topic_replies: "Permita que remetentes desconhecidos respondam a tópicos."
+            allow_unknown_sender_topic_replies_hint: "Permite que remetentes desconhecidos(as) respondam a tópicos de grupo. Se não estiver ativado, será criado um novo tópico para respostas de endereços de e-mail de usuários(as) não convidados para o tópico."
           mailboxes:
             synchronized: "Caixa de mensagens sincronizada"
             none_found: "Nenhuma caixa de mensagens foi encontrada nesta conta de e-mail."
+            disabled: "Desativado(a)"
         membership:
           title: Assinatura
           access: Acesso
@@ -666,6 +690,12 @@ pt_BR:
         tags:
           title: Etiquetas
           long_title: "Notificações padrão das etiquetas"
+          description: "Quando usuários(as) são adicionados(as) a esse grupo, suas configurações de notificação de etiqueta serão definidas para estes padrões. Em seguida, poderão ser alteradas."
+          watched_tags_instructions: "Você acompanha todos os tópicos com estas etiquetas automaticamente. Membros do grupo serão notificados de todas as postagens novas, e varias delas também serão exibidas perto do tópico."
+          tracked_tags_instructions: "Monitore automaticamente todos os tópicos com estas etiquetas. Uma contagem de postagens novas será exibida ao lado do tópico."
+          watching_first_post_tags_instructions: "Os(as) usuários(as) receberão uma notificação sobre a primeira postagem em cada tópico novo com estas etiquetas."
+          regular_tags_instructions: "Se estas etiquetas forem silenciadas, elas não serão silenciadas para membros do grupo. Os(as) usuários(as) serão notificados em caso de menção ou resposta."
+          muted_tags_instructions: "Os(as) usuários(as) não receberão notificação sobre novos tópicos com estas etiquetas, e eles não serão exibidas nos mais recentes."
         logs:
           title: "Registros"
           when: "Quando"
@@ -722,8 +752,6 @@ pt_BR:
         public: "Público"
         private: "Privado"
         public_groups: "Grupos públicos"
-        automatic_group: Grupo automático
-        close_group: Fechar grupo
         my_groups: "Meus grupos"
         group_type: "Tipo de grupo"
         is_group_user: "Membro"
@@ -800,6 +828,11 @@ pt_BR:
       flair_type:
         icon: "Selecione um ícone"
         image: "Enviar arquivo"
+      default_notifications:
+        modal_title: "Notificações padrão do(a) usuário(a)"
+        modal_description: "Você gostaria de aplicar esta alteração historicamente? Isto mudará as preferências de %{count} usuários(as) existentes."
+        modal_yes: "Sim"
+        modal_no: "Não, apenas aplique alterações daqui para frente"
     user_action_groups:
       "1": "Curtidas"
       "2": "Curtidas"
@@ -829,15 +862,20 @@ pt_BR:
       posts: "Postagens"
       topics: "Tópicos"
       latest: "Últimos"
-      toggle_ordering: "alternar controle de ordenação"
       subcategories: "Subcategorias"
       muted: "Categorias silenciadas"
       topic_sentence:
         one: "%{count} tópico"
         other: "%{count} tópicos"
+      topic_stat:
+        one: "%{number}/%{unit}\n"
+        other: "%{number}/%{unit}"
       topic_stat_unit:
         week: "semana"
         month: "mês"
+      topic_stat_all_time:
+        one: "%{number} no total"
+        other: "%{number} no total"
       topic_stat_sentence_week:
         one: "%{count} novo tópico na última semana."
         other: "%{count} novos tópicos na última semana."
@@ -899,6 +937,9 @@ pt_BR:
         normal_option: "Normal"
         normal_option_title: "Você receberá uma notificação se este(a) usuário(a) responder, citar ou mencionar."
       notification_schedule:
+        title: "Agendamento de notificações"
+        label: "Ativar agendamento de notificações personalizada"
+        tip: "Fora desses horários, você será colocado automaticamente \"não perturbe\"."
         midnight: "Meia-noite"
         none: "Nenhum"
         monday: "Segunda-feira"
@@ -945,13 +986,35 @@ pt_BR:
       dismiss: "Descartar"
       dismiss_notifications: "Descartar tudo"
       dismiss_notifications_tooltip: "Marcar todas as notificações não lidas como lidas"
+      no_messages_title: "Você não tem mensagens"
+      no_messages_body: >
+        Precisa ter uma conversa pessoal direta, fora do fluxo de conversa normal? Envie uma mensagem ao selecionar o seu avatar e usar o botão de mensagem %{icon}.<br><br> Se precisar de ajuda, envie uma <a href='%{aboutUrl}'>mensagem a um membro da equipe</a>.
+      no_bookmarks_title: "Você ainda não adicionou nada aos favoritos"
+      no_bookmarks_body: >
+        Comece a adicionar postagens aos favoritos com o botão %{icon}, eles serão listados aqui para consulta rápida. Você pode agendar um lembrete também!
       no_notifications_title: "Você ainda não tem nenhuma notificação"
+      no_notifications_body: >
+        Neste painel, você receberá notificações sobre atividades relevantes, inclusive respostas aos seus tópicos e postagens, quando você for citado(a) ou mencionado(a) (<b>@mentions</b>) por alguém e quando os tópicos que você estiver acompanhando receberem respostas. As notificações também serão enviadas por e-mail quando você passar algum tempo sem entrar com a conta. <br><br> Procure por %{icon} para decidir sobre quais tópicos, categorias e etiquetas específicas você quer receber notificações. Para obter mais informações, verifique suas <a href='%{preferencesUrl}'>preferências de notificações</a>.
       first_notification: "Sua primeira notificação! Selecione-a para começar."
       dynamic_favicon: "Exibir contagens no ícone do navegador"
+      skip_new_user_tips:
+        description: "Pular emblemas e dicas de integração de novo(a) usuário(a)"
+        not_first_time: "Não é a sua primeira vez?"
+        skip_link: "Pular estas dicas"
+        read_later: "Vou ler mais tarde."
       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"
       color_schemes:
+        default_description: "Tema padrão"
+        disable_dark_scheme: "O mesmo que o normal"
+        dark_instructions: "É possível pré-visualizar o esquema de cores do modo escuro ao ativar/desativar o modo escuro do seu dispositivo."
         undo: "Redefinir"
         regular: "Normal"
+        dark: "Modo escuro"
+        default_dark_scheme: "(padrão do site)"
+      dark_mode: "Modo escuro"
+      dark_mode_enable: "Ativar o esquema de cores do modo escuro automaticamente"
       text_size_default_on_all_devices: "Definir este tamanho de texto como padrão em todos os meus dispositivos"
       allow_private_messages: "Permitir que outros(as) usuários(as) me enviem mensagens pessoais"
       external_links_in_new_tab: "Abrir todos os links externos em uma nova aba"
@@ -1010,6 +1073,9 @@ pt_BR:
       users: "Usuários"
       muted_users: "Silenciados(as)"
       muted_users_instructions: "Bloquear todas as notificações e mensagens privadas destes(as) usuários(as)."
+      allowed_pm_users: "Permitido(a)"
+      allowed_pm_users_instructions: "Apenas MP destes(as) usuários(as)."
+      allow_private_messages_from_specific_users: "Permitir que apenas usuários(as) específicos(as) mandem mensagens pessoais"
       ignored_users: "Ignorados(as)"
       ignored_users_instructions: "Bloquear todas as postagens, notificações e mensagens privadas destes(as) usuários(as)."
       tracked_topics_link: "Exibir"
@@ -1040,6 +1106,7 @@ pt_BR:
         move_to_archive: "Arquivar"
         failed_to_move: "Falha ao mover as mensagens selecionadas (talvez você esteja sem conexão com a internet)"
         tags: "Etiquetas"
+        warnings: "Avisos oficiais"
       preferences_nav:
         account: "Conta"
         security: "Segurança"
@@ -1061,19 +1128,30 @@ pt_BR:
         choose_new: "Escolha uma nova senha"
         choose: "Escolha uma senha"
       second_factor_backup:
+        title: "Códigos de backup de dois fatores"
         regenerate: "Gerar novamente"
         disable: "Desativar"
         enable: "Ativar"
         enable_long: "Ativar códigos de backup"
+        manage:
+          one: "Gerenciar códigos de backup. Você tem <strong>%{count}</strong> código de backup restante."
+          other: "Gerenciar códigos de backup. Você tem <strong>%{count}</strong> códigos de backup restantes."
         copy_to_clipboard: "Copiar para área de transferência"
         copy_to_clipboard_error: "Erro ao copiar dados para a área de transferência"
         copied_to_clipboard: "Copiou para a área de transferência"
         download_backup_codes: "Baixar códigos de backup"
+        remaining_codes:
+          one: "Você tem <strong>%{count}</strong> código de backup restante."
+          other: "Você tem <strong>%{count}</strong> códigos de backup restantes."
         use: "Usar um código de backup"
+        enable_prerequisites: "Você deve ativar um método de dois fatores primários antes de gerar código de backup."
         codes:
           title: "Códigos de backup gerados"
           description: "Cada um destes códigos de backup só pode ser usado uma vez. Mantenha-os em algum lugar seguro, mas acessível."
       second_factor:
+        title: "Autenticação de dois fatores"
+        enable: "Gerenciar autenticação de dois fatores"
+        disable_all: "Desativar tudo"
         forgot_password: "Esqueceu a senha?"
         confirm_password_description: "Confirme sua senha para continuar"
         name: "Nome"
@@ -1085,10 +1163,17 @@ pt_BR:
         show_key_description: "Inserir manualmente"
         short_description: |
           Proteja sua conta com códigos de segurança de uso único.
+        extended_description: |
+          A autenticação de dois fatores adiciona segurança extra à sua conta, exigindo um token único além da sua senha. Tokens podem ser gerados em dispositivos <a href="https://www.google.com/search?q=authenticator+apps+for+android" target='_blank'>Android</a> e <a href="https://www.google.com/search?q=authenticator+apps+for+ios">iOS</a>.
+        oauth_enabled_warning: "Observe que as entradas com rede social serão desativadas após a ativação da autenticação de dois fatores na sua conta."
         use: "Usar app autenticador"
+        enforced_notice: "Você precisa ativar a autenticação de dois fatores antes de acessar este site."
         disable: "Desativar"
+        disable_confirm: "Tem certeza que você quer desativar todo os métodos de dois fatores?"
         save: "Salvar"
         edit: "Editar"
+        edit_title: "Editar autenticador"
+        edit_description: "Nome do autenticador"
         enable_security_key_description: |
           Quando sua <a href="https://www.google.com/search?q=hardware+security+key" target="_blank">chave de segurança física</a> estiver preparada, pressione o botão Registrar abaixo.
         totp:
@@ -1123,6 +1208,7 @@ pt_BR:
         taken: "Desculpe, este e-mail não está disponível."
         error: "Houve um erro ao alterar seu e-mail. Talvez aquele endereço já esteja sendo usado?"
         success: "Enviamos um e-mail para esse endereço. Siga as instruções para confirmar."
+        success_via_admin: "Enviamos um e-mail para esse endereço. O(a) usuário(a) precisará seguir as instruções de confirmação do e-mail."
         success_staff: "Enviamos um e-mail para o seu endereço atual. Siga as instruções para confirmar."
       change_avatar:
         title: "Alterar sua imagem de perfil"
@@ -1158,12 +1244,16 @@ pt_BR:
         set_primary: "Definir e-mail primário"
         destroy: "Remover e-mail"
         add_email: "Adicionar e-mail alternativo"
+        auth_override_instructions: "É possível atualizar o e-mail com o provedor de autenticação."
         no_secondary: "Nenhum e-mail secundário"
         instructions: "Nunca visível publicamente."
+        admin_note: "Observação: se um usuário(a) administrador(a) alterar o e-mail de um(a) usuário(a) não administrador(a), esse usuário perderá acesso à sua conta de e-mail original, de modo que um e-mail de redefinição de senha será enviado para o novo endereço. O e-mail do usuário não será alterado até que o processo de redefinição de senha seja concluído."
         ok: "Enviaremos um e-mail para confirmar"
         required: "Digite um endereço de e-mail"
         invalid: "Insira um endereço de e-mail válido"
         authenticated: "Seu e-mail foi autenticado por %{provider}"
+        invite_auth_email_invalid: "Seu e-mail de convite não é igual ao e-mail autenticado por %{provider}"
+        authenticated_by_invite: "Seu e-mail foi autenticado pelo convite"
         frequency_immediately: "Enviaremos um e-mail imediatamente se você não tiver lido sobre o motivo do envio da nossa mensagem."
         frequency:
           one: "Enviaremos um e-mail apenas se você não tiver acessado no último minuto."
@@ -1220,8 +1310,10 @@ pt_BR:
         browser_and_device: "%{browser} em %{device}"
         secure_account: "Proteger minha conta"
         latest_post: "Você postou por último…"
+        device_location: '<span class="auth-token-device">%{device}</span> &ndash; <span title="IP: %{ip}">%{location}</span>'
+        browser_active: '%{browser} | <span class="active">ativar agora</span>'
+        browser_last_seen: "%{browser}|%{date}"
       last_posted: "Última postagem"
-      last_emailed: "Último e-mail enviado"
       last_seen: "Vistos"
       created: "Ingressou"
       log_out: "Sair"
@@ -1232,6 +1324,7 @@ pt_BR:
       enable_physical_keyboard: "Ativar suporte para teclado físico no iPad"
       text_size:
         title: "Tamanho do texto"
+        smallest: "Menor"
         smaller: "Menor"
         normal: "Normal"
         larger: "Grande"
@@ -1293,15 +1386,22 @@ pt_BR:
         title: "Convites"
         pending_tab: "Pendentes"
         pending_tab_with_count: "Pendentes (%{count})"
+        expired_tab: "Expirado(a)"
+        expired_tab_with_count: "Expirado(a) (%{count})"
         redeemed_tab: "Resgatados"
         redeemed_tab_with_count: "Resgatados (%{count})"
         invited_via: "Convite"
+        invited_via_link: "vincular %{key} (%{count}/%{max} resgatado(s))"
         groups: "Grupos"
         topic: "Tópico"
+        sent: "Criado/enviado por último"
+        expires_at: "Expira"
         edit: "Editar"
         remove: "Remover"
+        copy_link: "Obter link"
         reinvite: "Enviar e-mail novamente"
         reinvited: "Convite enviado novamente"
+        removed: "Removido(a)"
         search: "digite para pesquisar convites..."
         user: "Usuário(a) convidado(a)"
         none: "Não há convites para exibir."
@@ -1317,15 +1417,52 @@ pt_BR:
         remove_all: "Remover convites expirados"
         removed_all: "Todos os convites expirados foram removidos!"
         remove_all_confirm: "Tem certeza de que deseja remover todos os convites expirados?"
+        reinvite_all: "Reenviar todos os convites"
         reinvite_all_confirm: "Tem certeza de que deseja enviar novamente todos os convites?"
+        reinvited_all: "Todos os convites foram enviados!"
         time_read: "Tempo de leitura"
         days_visited: "Dias acessados"
         account_age_days: "Idade da conta em dias"
         create: "Convidar"
+        generate_link: "Criar link de convite"
+        link_generated: "Confira o seu link de convite"
         valid_for: "O link do convite é válido apenas para este endereço de e-mail: %{email}"
+        single_user: "Convidar por e-mail"
+        multiple_user: "Convidar por link"
         invite_link:
+          title: "Link de convite"
           success: "Link do convite gerado com sucesso!"
+          error: "Ocorreu um erro ao gerar o link de convite"
+          max_redemptions_allowed_label: "Quantas pessoas têm permissão para se cadastrar usando este link?"
+          expires_at: "Quando este link de convite irá expirar?"
+        invite:
+          new_title: "Criar convite"
+          edit_title: "Editar convite"
+          instructions: "Compartilhar este link para conceder acesso imediato ao site"
+          copy_link: "copiar link"
+          expires_in_time: "Expira em %{time}"
+          expired_at_time: "Expirou em %{time}"
+          show_advanced: "Exibir opções avançadas"
+          hide_advanced: "Ocultar opções avançadas"
+          restrict_email: "Restringir a um endereço de e-mail"
+          max_redemptions_allowed: "Máximo de usos"
+          add_to_groups: "Adicionar a grupos"
+          invite_to_topic: "Buscar tópico"
+          expires_at: "Expira após"
+          custom_message: "Mensagem pessoal opcional"
+          send_invite_email: "Salvar e enviar e-mail"
+          save_invite: "Salvar convite"
+          invite_saved: "Convite salvo"
+          invite_copied: "Link de convite copiado"
         bulk_invite:
+          none: "Nenhum convite para exibir nesta página."
+          text: "Convite em massa"
+          instructions: |
+            <p>Convide uma lista de usuários(as) para promover a sua comunidade rapidamente. Prepare um <a href="https://en.wikipedia.org/wiki/Comma-separated_values" target="_blank">arquivo CSV</a> contendo pelo menos uma linha por endereço de e-mail dos usuários(as) que você quer convidar. As informações separadas por vírgula a seguir podem ser fornecidas se você quiser adicionar pessoas a grupos ou enviá-las para um tópico específico quando entrarem com a conta pela primeira vez.</p>
+            <pre>john@smith.com,first_group_name;second_group_name,topic_id</pre>
+            <p>Todos os endereços de e-mail no arquivo CSV enviado serão mandados como convite, e você poderá gerenciá-lo mais tarde.</p>
+          progress: "%{progress} enviado(s)..."
+          success: "Arquivo enviado com sucesso, você será notificado(a) por mensagem quando o processo for concluído."
           error: "Desculpe, o arquivo deve estar no formato CSV."
       password:
         title: "Senha"
@@ -1390,10 +1527,16 @@ pt_BR:
       avatar:
         title: "Imagem do perfil"
         header_title: "perfil, mensagens, favoritos e preferências"
+        name_and_description: "%{name} - %{description}"
         edit: "Editar imagem do perfil"
       title:
         title: "Título"
         none: "(nenhum)"
+        instructions: "aparece depois do seu nome de usuário(a)"
+      flair:
+        title: "Estilo"
+        none: "(nenhum)"
+        instructions: "ícone exibido perto da imagem do seu perfil"
       primary_group:
         title: "Grupo primário"
         none: "(nenhum)"
@@ -1428,6 +1571,7 @@ pt_BR:
       close: "fechar"
       dismiss_error: "Descartar erro"
     close: "Fechar"
+    assets_changed_confirm: "Este site acabou de receber uma atualização de software. Obter a versão mais recente agora?"
     logout: "Você foi desconectado(a)."
     refresh: "Atualizar"
     home: "Início"
@@ -1464,10 +1608,15 @@ pt_BR:
       sign_up: "Cadastrar-se"
       hide_session: "Lembrar amanhã"
       hide_forever: "não, obrigado(a)"
+      hidden_for_session: "Ok, vamos perguntar amanhã. Você sempre pode usar \"Entrar\" para criar uma conta também."
       intro: "Olá! Parece que você está gostando da discussão, mas ainda não cadastou uma conta."
       value_prop: "Ao cadastrar uma conta, lembramos exatamente o que foi lido para que você sempre continue de onde parou. Você também recebe notificações, por aqui e via e-mail, sempre que alguém responder. E você pode curtir as postagens para compartilhar o amor. :heartpulse:"
     summary:
       enabled_description: "Você está vendo um resumo deste tópico: as postagens mais interessantes segundo a comunidade."
+      description:
+        one: "Existe <b>%{count}</b> resposta."
+        other: "Existem <b>%{count}</b> respostas."
+      description_time_MF: "Há {replyCount, plural, one {<b>#</b> resposta} other {<b>#</b> respostas}} com um tempo de leitura estimado de <b>{readingTime, plural, one {# minuto} other {# minutos}}</b>."
       enable: "Resumir este tópico"
       disable: "Exibir todas as postagens"
     deleted_filter:
@@ -1479,6 +1628,7 @@ pt_BR:
       title: "Mensagem"
       invite: "Convidar outros..."
       edit: "Adicionar ou remover..."
+      remove: "Remover..."
       add: "Adicionar..."
       leave_message: "Tem certeza de que quer sair desta mensagem?"
       remove_allowed_user: "Tem certeza de que quer remover %{name} desta mensagem?"
@@ -1492,7 +1642,9 @@ pt_BR:
     search_hint: "nome do(a) usuário(a), e-mail ou endereço IP"
     create_account:
       header_title: "Boas-vindas!"
+      subheader_title: "Vamos criar a sua conta"
       disclaimer: "Ao se cadastrar, você concorda com a <a href='%{privacy_link}' target='blank'>política de privacidade</a> e os <a href='%{tos_link}' target='blank'>termos de serviço</a>."
+      title: "Criar sua conta"
       failed: "Algo deu errado, talvez este e-mail já esteja cadastrado, tente usar o link de senha esquecida."
     forgot_password:
       title: "Redefinição de senha"
@@ -1511,6 +1663,7 @@ pt_BR:
     email_login:
       link_label: "Envie por e-mail um link para entrar"
       button_label: "com e-mail"
+      login_link: "Pular a senha, enviar um link por e-mail para entrar com a conta"
       emoji: "emoji de bloqueio"
       complete_username: "Se uma conta corresponder ao nome de usuário(a) <b>%{username}</b>, em breve você deverá receber um e-mail com um link para entrar."
       complete_email: "Se uma conta corresponder à <b>%{email}</b>, em breve você deverá receber um e-mail com um link para entrar."
@@ -1522,10 +1675,15 @@ pt_BR:
       logging_in_as: Entrando como %{email}
       confirm_button: Terminar de entrar
     login:
+      header_title: "Boas-vinda outra vez"
+      subheader_title: "Entrar com a sua conta"
+      title: "Entrar"
       username: "Usuário(a)"
       password: "Senha"
+      second_factor_title: "Autenticação de dois fatores"
       second_factor_description: "Digite o código de autenticação do seu aplicativo:"
       second_factor_backup: "Entrar usando um código de backup"
+      second_factor_backup_title: "Backup de dois fatores"
       second_factor_backup_description: "Insira um dos seus códigos de backup:"
       second_factor: "Fazer login usando um aplicativo de autenticação"
       security_key_description: "Quando você tiver uma chave física de segurança preparada, pressione o botão abaixo Autenticar com chave de segurança."
@@ -1534,6 +1692,7 @@ pt_BR:
       security_key_not_allowed_error: "O processo de autenticação com chave de segurança atingiu o limite de tempo ou foi cancelado."
       security_key_no_matching_credential_error: "Nenhuma credencial correspondente pôde ser encontrada na chave de segurança informada."
       security_key_support_missing_error: "Seu dispositivo ou navegador atual não são compatíveis com o uso de chaves de segurança. Use um método diferente."
+      email_placeholder: "E-mail/nome do(a) usuário(a)"
       caps_lock_warning: "Caps Lock está ativado"
       error: "Erro desconhecido"
       cookies_error: "Pelo visto, os cookies do seu navegador estão desativados. Talvez você não consiga entrar em ativá-los antes."
@@ -1548,8 +1707,10 @@ pt_BR:
       awaiting_approval: "Sua conta ainda não foi aprovada por um membro da equipe. Você receberá um e-mail quando isso acontecer."
       requires_invite: "Desculpe, o acesso a este fórum é permitido somente pelo convite de outro membro."
       not_activated: "Você não pode entrar ainda. Nós enviamos um e-mail de ativação antes para o endereço <b>%{sentTo}</b>. Siga as instruções deste e-mail para ativar a sua conta."
+      not_allowed_from_ip_address: "Você não pode entrar com este endereço IP."
       admin_not_allowed_from_ip_address: "Você não pode entrar como administrador(a) com este endereço IP."
       resend_activation_email: "Clique aqui para enviar o e-mail de ativação novamente."
+      omniauth_disallow_totp: "Sua conta tem autenticação dois fatores ativada. Entre com sua senha."
       resend_title: "Enviar novamente e-mail de ativação"
       change_email: "Alterar endereço de e-mail"
       provide_new_email: "Informe um novo endereço de e-mail e enviaremos novamente o seu e-mail de confirmação."
@@ -1615,6 +1776,16 @@ pt_BR:
       enter: "Enter"
     conditional_loading_section:
       loading: Carregando...
+    category_row:
+      topic_count:
+        one: "%{count} tópico nesta categoria"
+        other: "%{count} tópicos nesta categoria"
+      plus_subcategories_title:
+        one: "%{name} e uma subcategoria"
+        other: "%{name} e %{count} subcategorias"
+      plus_subcategories:
+        one: "+%{count} subcategoria"
+        other: "+%{count} subcategorias"
     select_kit:
       filter_by: "Filtrar por: %{name}"
       select_to_filter: "Selecione um valor para filtrar"
@@ -1629,9 +1800,14 @@ pt_BR:
       min_content_not_reached:
         one: "Selecione pelo menos %{count} item."
         other: "Selecione pelo menos %{count} itens."
+      invalid_selection_length:
+        one: "A seleção deve ter pelo menos %{count} caracter."
+        other: "A seleção deve ter pelo menos %{count} caracteres."
       components:
         tag_drop:
           filter_for_more: Filtre para ver mais...
+        categories_admin_dropdown:
+          title: "Gerenciar categorias"
     date_time_picker:
       from: De
       to: Para
@@ -1656,6 +1832,7 @@ pt_BR:
       default: Emojis personalizados
     shared_drafts:
       title: "Rascunhos compartilhados"
+      notice: "Este tópico está visível apenas para quem puder publicar rascunhos compartilhados."
       destination_category: "Categoria de destino"
       publish: "Publicar rascunho compartilhado"
       confirm_publish: "Você tem certeza de que deseja publicar este rascunho?"
@@ -1674,6 +1851,9 @@ pt_BR:
       similar_topics: "Seu tópico é parecido com..."
       drafts_offline: "rascunhos off-line"
       edit_conflict: "editar conflito"
+      group_mentioned_limit:
+        one: "<b>Aviso!</b> Você menciou <a href='%{group_link}'>%{group}</a>, mas este grupo tem mais membros do que o limite de menções configurado pelo(a) administrador(a) de %{count} usuário. Ninguém será notificado(a)."
+        other: "<b>Aviso!</b> Você menciou <a href='%{group_link}'>%{group}</a>, mas este grupo tem mais membros do que o limite de menções configurado pelo(a) administrador(a) de %{count} usuários. Ninguém será notificado(a)."
       group_mentioned:
         one: "Ao mencionar %{group}, você está prestes a notificar <a href='%{group_link}'>%{count} pessoa</a>. Tem certeza?"
         other: "Ao mencionar %{group}, você está prestes a notificar <a href='%{group_link}'>%{count} pessoas</a>. Tem certeza?"
@@ -1684,9 +1864,21 @@ pt_BR:
       reference_topic_title: "RE: %{title}"
       error:
         title_missing: "O título é obrigatório"
+        title_too_short:
+          one: "O título deve ter pelo menos %{count} caracter"
+          other: "Título precisa ter no mínimo %{count} caracteres"
+        title_too_long:
+          one: "O título não pode ter mais do que %{count} caracter"
+          other: "O título não pode ter mais do que %{count} caracteres"
         post_missing: "A postagem não pode estar vazia"
+        post_length:
+          one: "A postagem deve ter pelo menos %{count} caracter"
+          other: "A postagem deve ter pelo menos %{count} caracteres"
         try_like: "Você já tentou o botão %{heart}?"
         category_missing: "Você precisa escolher uma categoria"
+        tags_missing:
+          one: "É preciso escolher pelo menos %{count} etiqueta"
+          other: "É preciso escolher pelo menos %{count} etiquetas"
         topic_template_not_modified: "Adicione detalhes e especificações ao seu tópico editando o modelo do tópico."
       save_edit: "Salvar edição"
       overwrite_edit: "Sobrescrever edição"
@@ -1714,6 +1906,8 @@ pt_BR:
       saved: "Salvou!"
       saved_draft: "Rascunho de postagem em andamento. Toque para retomar."
       uploading: "Enviando..."
+      show_preview: "exibir pré-visualização"
+      hide_preview: "ocultar pré-visualização"
       quote_post_title: "Citar postagem inteira"
       bold_label: "N"
       bold_title: "Negrito"
@@ -1743,23 +1937,31 @@ pt_BR:
       abandon: "fechar compositor e descartar rascunho"
       enter_fullscreen: "entrar no compositor em tela cheia"
       exit_fullscreen: "sair do compositor em tela cheia"
+      show_toolbar: "exibir barra de ferramentas do compositor"
+      hide_toolbar: "ocultar barra de ferramentas do compositor"
       modal_ok: "Ok"
       modal_cancel: "Cancelar"
       cant_send_pm: "Desculpe, você não pode enviar uma mensagem para %{username}."
       yourself_confirm:
         title: "Você se esqueceu de adicionar destinatários?"
         body: "Por enquanto, esta mensagem está sendo enviada apenas para você mesmo(a)!"
+      slow_mode:
+        error: "Este tópico está no modo lento. Você já postou recentemente. É possível postar outra vez em %{timeLeft}."
       admin_options_title: "Configurações opcionais da equipe para este tópico"
       composer_actions:
         reply: Responder
         draft: Rascunho
         edit: Editar
         reply_to_post:
+          label: Responder a uma publicação de %{postUsername}
           desc: Responder a uma postagem específica
         reply_as_new_topic:
           label: Responder como tópico relacionado
           desc: Criar um novo tópico relacionado a este tópico
           confirm: Você tem um novo rascunho de tópico salvo, que será substituído ao criar um tópico vinculado.
+        reply_as_new_group_message:
+          label: Responder como nova mensagem de grupo
+          desc: Crie uma nova mensagem começando com os mesmo destinatários
         reply_as_private_message:
           label: Nova mensagem
           desc: Criar uma nova mensagem pessoal
@@ -1773,6 +1975,7 @@ pt_BR:
           label: "Novo tópico"
         shared_draft:
           label: "Rascunho compartilhado"
+          desc: "Fazer rascunho do tópico visívei apenas para usuários(as) com permissão"
         toggle_topic_bump:
           label: "Alternar promoção de tópico"
           desc: "Responder sem alterar a data da última resposta"
@@ -1820,8 +2023,12 @@ pt_BR:
       topic_reminder: "<span>%{username}</span> %{description}"
       watching_first_post: "<span>Novo tópico</span> %{description}"
       membership_request_accepted: "Associação aceita em '%{group_name}'"
+      membership_request_consolidated:
+        one: "%{count} solicitação de associação aberta para \"%{group_name}\""
+        other: "%{count} solicitações de associação abertas para \"%{group_name}\""
       reaction: "<span>%{username}</span> %{description}"
       reaction_2: "<span>%{username}, %{username2}</span> %{description}"
+      votes_released: "%{description} - concluído(a)"
       group_message_summary:
         one: "%{count} mensagem na caixa de entrada de %{group_name}"
         other: "%{count} mensagens na caixa de entrada de %{group_name}"
@@ -1861,8 +2068,10 @@ pt_BR:
         post_approved: "postagem aprovada"
         membership_request_consolidated: "novas solicitações de associação"
         reaction: "nova reação"
+        votes_released: "Voto emitido"
     upload_selector:
       uploading: "Enviando"
+      processing: "Processando envio"
       select_file: "Selecionar arquivo"
       default_image_alt_text: imagem
     search:
@@ -1956,6 +2165,7 @@ pt_BR:
     go_back: "voltar"
     not_logged_in_user: "página do(a) usuário(a) com resumo de atividades e preferências atuais"
     current_user: "ir para a sua página do(a) usuário(a)"
+    view_all: "exibir tudo %{tab}"
     topics:
       new_messages_marker: "último acesso"
       bulk:
@@ -1967,10 +2177,19 @@ pt_BR:
         delete: "Excluir tópicos"
         dismiss: "Descartar"
         dismiss_read: "Descartar todos os não lidos"
+        dismiss_read_with_selected:
+          one: "Descartar %{count} não lida"
+          other: "Descartar %{count} não lidos(as)"
         dismiss_button: "Descartar..."
+        dismiss_button_with_selected:
+          one: "Descartar (%{count})…"
+          other: "Descartar (%{count})…"
         dismiss_tooltip: "Descartar apenas postagens novas ou parar de monitorar tópicos"
         also_dismiss_topics: "Parar de acompanhar estes tópicos para que eles deixem de aparecer como não lidos para mim"
         dismiss_new: "Descartar novos"
+        dismiss_new_with_selected:
+          one: "Descartar novo(a) (%{count})"
+          other: "Descartar novos(as) (%{count})"
         toggle: "alternar seleção de tópicos em massa"
         actions: "Ações em massa"
         change_category: "Definir categoria"
@@ -1978,6 +2197,7 @@ pt_BR:
         archive_topics: "Arquivar tópicos"
         move_messages_to_inbox: "Mover para caixa de entrada"
         notification_level: "Notificações"
+        change_notification_level: "Alterar nível de notificação"
         choose_new_category: "Escolha a nova categoria para os tópicos:"
         selected:
           one: "Você selecionou <b>%{count}</b> tópico."
@@ -1987,14 +2207,25 @@ pt_BR:
         choose_new_tags: "Escolha novas etiquetas para estes tópicos:"
         choose_append_tags: "Escolha novas etiquetas para adicionar a estes tópicos:"
         changed_tags: "As etiquetas destes tópicos foram alteradas."
+        remove_tags: "Remover todas as etiquetas"
+        confirm_remove_tags:
+          one: "Todas as etiquetas serão removidas deste tópico. Deseja prosseguir?"
+          other: "Todas as etiquetas serão removidas de <b>%{count}</b> tópicos. Deseja prosseguir?"
+        progress:
+          one: "Progresso: <strong>%{count}</strong> tópico"
+          other: "Progresso: <strong>%{count}</strong> tópicos"
       none:
         unread: "Você não tem tópicos não lidos."
         new: "Você não tem novos tópicos."
         read: "Você ainda não leu nenhum tópico."
         posted: "Você ainda não postou em nenhum tópico."
+        latest: "Não tem mais novidades!"
         bookmarks: "Você ainda não tem nenhum tópico favorito."
         category: "Não há tópicos na categoria %{category}."
         top: "Não há melhores tópicos."
+        educate:
+          new: '<p>Seus novos tópicos serão exibidos aqui. Por padrão, os tópicos serão considerados novos e exibirão um <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> indicador se tiverem tido criados nos últimos dois dias.</p><p>Acesse suas <a href="%{userPrefsUrl}">preferências</a> para alterar essa configuração.</p>'
+          unread: "<p>Seus tópicos não lidos são exibidos aqui.</p><p>Por padrão, os tópicos são considerados como não lidos e exibirão contadores <span class=\"badge unread-posts badge-notification\">1</span> se você tiver:</p><ul><li>criado o tópico</li><li>respondido ao tópico</li><li>lido o tópico por mais de 4 minutos</li></ul><p>ou marcado o tópico como Monitorado ou Acompanhado pelo \U0001F514 em cada tópico.</p><p>Acesse suas <a href=\"%{userPrefsUrl}\">preferências</a> para alterar essa configuração.</p>"
       bottom:
         latest: "Não há mais últimos tópicos."
         posted: "Não há mais tópicos postados."
@@ -2025,13 +2256,6 @@ pt_BR:
       defer:
         help: "Marcar como não lido"
         title: "Adiar"
-      feature_on_profile:
-        help: "Adicionar um link para este tópico em seu cartão de usuário(a) e perfil"
-        title: "Recurso no perfil"
-      remove_from_profile:
-        warning: "Seu perfil já tem um tópico em destaque. Se você continuar, este tópico substituirá o tópico existente."
-        help: "Remover o link para este tópico no seu perfil de usuário(a)"
-        title: "Remover do perfil"
       list: "Tópicos"
       new: "novo tópico"
       unread: "não lido"
@@ -2052,23 +2276,36 @@ pt_BR:
       not_found:
         title: "Tópico não encontrado"
         description: "Desculpe, não foi possível encontrar esse tópico. Talvez tenha sido removido pela moderação."
+      unread_posts:
+        one: "você tem %{count} postagem não lida neste tópico"
+        other: "você tem %{count} postagens não lidas neste tópico"
       likes:
         one: "há %{count} curtida neste tópico"
         other: "há %{count} curtidas neste tópico"
       back_to_list: "Voltar para a lista de tópicos"
       options: "Opções de tópico"
       show_links: "exibir links neste tópico"
+      collapse_details: "recolher detalhes do tópico"
+      expand_details: "expandir detalhes do tópico"
       read_more_in_category: "Quer ler mais? Veja outros tópicos em %{catLink} ou %{latestLink}."
       read_more: "Quer ler mais? %{catLink} ou %{latestLink}."
       unread_indicator: "Nenhum membro leu a última postagem deste tópico ainda."
+      read_more_MF: "Há { UNREAD, plural, =0 {} one {<a href='{basePath}/unread'># não lido</a> } other {<a href='{basePath}/unread'># não lidos</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{e } false {é } other{}} <a href='{basePath}/new'># novo</a> tópico} other { {BOTH, select, true{e } false {são } other{}} <a href='{basePath}/new'># novos</a> tópicos} } restante(s), ou {CATEGORY, select, true {procure outros tópicos em {catLink}} false {{latestLink}} other {}}"
       bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}"
       browse_all_categories: Ver todas as categorias
+      browse_all_tags: Procurar todas as etiquetas
       view_latest_topics: ver últimos tópicos
+      suggest_create_topic: Tudo pronto para <a href>começar uma nova conversa?</a>
       jump_reply_up: pular para a primeira resposta
       jump_reply_down: pular para a última resposta
       deleted: "Este tópico foi excluído"
       slow_mode_update:
+        title: "Modo lento"
+        select: "Os(as) usuários(as) podem postar neste tópico apenas a cada:"
+        description: "Para promover um diálogo saudável em discussões dinâmicas e acirradas, os(as) usuários(as) devem aguardar antes de postar neste tópico outra vez."
         enable: "Ativar"
+        update: "Atualizar"
+        enabled_until: "Ativado(a) até:"
         remove: "Desativar"
         hours: "Horas:"
         minutes: "Minutos:"
@@ -2084,6 +2321,9 @@ pt_BR:
           8_hours: "8 horas"
           12_hours: "12 horas"
           24_hours: "24 horas"
+          custom: "Duração personalizada"
+      slow_mode_notice:
+        duration: "Aguarde %{duration} entre as postagens neste tópico"
       topic_status_update:
         title: "Timer de tópico"
         save: "Definir timer"
@@ -2093,6 +2333,8 @@ pt_BR:
         publish_to: "Publicar em:"
         when: "Quando:"
         time_frame_required: "Selecione um intervalo de tempo"
+        min_duration: "A duração deve ser maior do que 0"
+        max_duration: "A duração deve ser menor do que 20 anos"
       auto_update_input:
         none: "Selecione um intervalo de tempo"
         now: "Agora"
@@ -2115,6 +2357,8 @@ pt_BR:
         title: "Agendar publicação"
       temp_open:
         title: "Abrir temporariamente"
+      auto_reopen:
+        title: "Abrir tópico automaticamente"
       temp_close:
         title: "Fechar temporariamente"
       auto_close:
@@ -2122,6 +2366,8 @@ pt_BR:
         label: "Fechar tópico automaticamente após:"
         error: "Digite um valor válido."
         based_on_last_post: "Não fechaeaté que a última postagem do tópico tenha pelo menos esta duração."
+      auto_close_after_last_post:
+        title: "Fechar tópico automaticamente após a última postagem"
       auto_delete:
         title: "Excluir tópico automaticamente"
       auto_bump:
@@ -2143,6 +2389,9 @@ pt_BR:
       auto_close_immediate:
         one: "A última postagem no tópico foi feita há %{count} hora, portanto o tópico será fechado imediatamente."
         other: "A última postagem no tópico já foi feita há %{count} horas, portanto o tópico será fechado imediatamente."
+      auto_close_momentarily:
+        one: "A última postagem no tópico foi feita há %{count} hora, portanto o tópico será fechado momentaneamente."
+        other: "A última postagem no tópico foi feita há %{count} hora, portanto o tópico será fechado momentaneamente."
       timeline:
         back: "Voltar"
         back_description: "Voltar para a sua última postagem não lida"
@@ -2154,6 +2403,9 @@ pt_BR:
         go: "ir"
         jump_bottom: "pular para a última postagem"
         jump_prompt: "pular para..."
+        jump_prompt_of:
+          one: "de %{count} postagem"
+          other: "de %{count} postagens"
         jump_prompt_long: "Pular para..."
         jump_bottom_with_number: "pular para postagem %{post_number}"
         jump_prompt_to_date: "até agora"
@@ -2213,6 +2465,7 @@ pt_BR:
         open: "Abrir tópico"
         close: "Fechar tópico"
         multi_select: "Selecionar postagens..."
+        slow_mode: "Ver modo lento"
         timed_update: "Definir timer do tópico..."
         pin: "Fixar tópico..."
         unpin: "Desafixar tópico..."
@@ -2228,6 +2481,7 @@ pt_BR:
         pin: "Fixar tópico"
         unpin: "Desafixar tópico"
         pin_globally: "Fixar tópico globalmente"
+        make_banner: "Criar tópico de banner"
         remove_banner: "Remover tópico de banner"
       reply:
         title: "Responder"
@@ -2236,6 +2490,14 @@ pt_BR:
         title: "Compartilhar"
         extended_title: "Compartilhar um link"
         help: "compartilhar um link deste tópico"
+        instructions: "Compartilhar um link para este tópico:"
+        copied: "Link do tópico copiado."
+        notify_users:
+          title: "Notificar"
+          instructions: "Notificar os(as) usuários(as) a seguir sobre este tópico:"
+          success:
+            one: "%{username} foi notificado(a) sobre este tópico."
+            other: "Todos os(as) usuários(as) foram notificados sobre este tópico."
         invite_users: "Convite"
       print:
         title: "Imprimir"
@@ -2259,6 +2521,9 @@ pt_BR:
           one: "Tópicos fixados em %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
           other: "Tópicos fixados em %{categoryLink}: <strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "Fazer com que este tópico apareça no topo de todas listas de tópicos até"
+        confirm_pin_globally:
+          one: "Você já tem %{count} tópico ficado globalmente. Uma grande quantidade de tópicos fixados pode atrapalhar usuários(as) novos(as) e anônimos(as). Tem certeza de que quer fixar outro tópico globalmente?"
+          other: "Você já tem %{count} tópicos ficados globalmente. Uma grande quantidade de tópicos fixados pode atrapalhar usuários(as) novos(as) e anônimos(as). Tem certeza de que quer fixar outro tópico globalmente?"
         unpin_globally: "Remover este tópico do inicio de todas as listas de tópicos."
         unpin_globally_until: "Remover este tópico do topo de todas listagens de tópicos ou esperar até <strong>%{until}</strong>."
         global_pin_note: "Usuários(as) podem desafixar o tópico individualmente para si."
@@ -2281,6 +2546,7 @@ pt_BR:
         success: "Convidamos esse usuário(a) para participar desta mensagem privada."
         success_group: "Convidamos esse grupo para participar desta mensagem."
         error: "Desculpe, houve um erro ao convidar este(a) usuário(a)."
+        not_allowed: "Desculpe, não é possível convidar este(a) usuário(a)."
         group_name: "nome do grupo"
       controls: "Controles do tópico"
       invite_reply:
@@ -2288,6 +2554,7 @@ pt_BR:
         username_placeholder: "nome do(a) usuário(a)"
         action: "Enviar convite"
         help: "Convidar outras pessoas para este tópico por e-mail ou notificação"
+        to_forum: "Enviaremos um e-mail breve que permite que seu(sua) amigo(a) ingresse imediatamente ao clicar no link."
         discourse_connect_enabled: "Digite o nome do(a) usuário(a) da pessoa que você gostaria de convidar para este tópico."
         to_topic_blank: "Digite o nome do(a) usuário(a) ou endereço de e-mail da pessoa que você gostaria de convidar para este tópico."
         to_topic_email: "Você digitou um endereço de e-mail. Enviaremos por e-mail um convite que permite que seu(sua) amigo(a) responda imediatamente a este tópico."
@@ -2352,6 +2619,7 @@ pt_BR:
         description: "Quando um tópico for publicado como uma página, sua URL pode ser compartilhada e será exibida com um estilo personalizado."
         slug: "Slug"
         public: "Público(a)"
+        public_description: "As pessoas podem visualizar a página se o tópico associado for privado."
         publish_url: "Sua página foi publicada em:"
         topic_published: "Seu tópico foi publicado em:"
         preview_url: "Sua página será publicada em:"
@@ -2398,18 +2666,22 @@ pt_BR:
         description:
           one: <b>%{count}</b> resposta selecionada.
           other: "<b>%{count}</b> respostas selecionadas."
+      deleted_by_author_simple: "(tópico excluído pelo(a) autor(a))"
     post:
       quote_reply: "Citação"
       quote_share: "Compartilhar"
       edit_reason: "Motivo:"
       post_number: "postagem %{number}"
       ignored: "Conteúdo ignorado"
+      wiki_last_edited_on: "última edição do wiki em %{dateTime}"
+      last_edited_on: "última edição da postagem em %{dateTime}"
       reply_as_new_topic: "Responder como um tópico vinculado"
       reply_as_new_private_message: "Responder como nova mensagem aos mesmos destinatários"
       continue_discussion: "Continuando a discussão de %{postLink}:"
       follow_quote: "ir para a resposta citada"
       show_full: "Exibir postagem completa"
       show_hidden: "Ver o conteúdo ignorado."
+      deleted_by_author_simple: "(postagem excluída pelo(a) autor(a))"
       collapse: "recolher"
       expand_collapse: "expandir/recolher"
       locked: "um membro da equipe bloqueou esta publicação para edição"
@@ -2423,6 +2695,7 @@ pt_BR:
       has_replies:
         one: "%{count} resposta"
         other: "%{count} respostas"
+      has_replies_count: "%{count}"
       unknown_user: "(usuário desconhecido/excluído)"
       has_likes_title:
         one: "%{count} pessoa curtiu esta postagem"
@@ -2431,15 +2704,23 @@ pt_BR:
       has_likes_title_you:
         one: "você e mais %{count} pessoa curtiram esta postagem"
         other: "você e mais %{count} outras pessoas curtiram esta postagem"
+      filtered_replies_hint:
+        one: "Exibir esta postagem e a resposta"
+        other: "Exibir esta postagem e as %{count} respostas"
       filtered_replies_viewing:
         one: "Exibindo %{count} resposta a"
         other: "Exibindo %{count} respostas a"
+      in_reply_to: "Carregar postagem pai"
+      view_all_posts: "visualizar todas as postagens"
       errors:
         create: "Desculpe, houve um erro ao criar sua postagem. Tente outra vez."
         edit: "Desculpe, houve um erro ao editar sua postagem. Tente outra vez."
         upload: "Desculpe, houve um erro ao enviar o arquivo. Tente outra vez."
         file_too_large: "Desculpe, este arquivo é muito grande (o tamanho máximo é de %{max_size_kb} KB). Que tal enviar o arquivo grande para um serviço de nuvem e compartilhar o link?"
         too_many_uploads: "Desculpe, você pode enviar apenas um arquivo por vez."
+        too_many_dragged_and_dropped_files:
+          one: "Desculpe, é possível carregar apenas %{count} arquivo por vez."
+          other: "Desculpe, é possível carregar apenas %{count} arquivos por vez."
         upload_not_authorized: "Desculpe, o arquivo que você está tentando enviar não é permitido (extensões permitidas: %{authorized_extensions})."
         image_upload_not_allowed_for_new_user: "Desculpe, usuários(as) novos(as) não podem enviar imagens."
         attachment_upload_not_allowed_for_new_user: "Desculpe, usuários(as) novos(as) não podem enviar anexos."
@@ -2454,8 +2735,6 @@ pt_BR:
       whisper: "esta mensagem é um sussuro privado para a moderação"
       wiki:
         about: "esta postagem é uma wiki"
-      archetypes:
-        save: "Salvar as opções"
       few_likes_left: "Obrigado por compartilhar o amor! Restam apenas algumas curtidas sobrando para você usar hoje."
       controls:
         reply: "começar a escrever uma resposta para esta postagem"
@@ -2496,9 +2775,18 @@ pt_BR:
         unlock_post_description: "permitir que o(a) autor(a) edite esta postagem"
         delete_topic_disallowed_modal: "Você não tem permissão para apagar este tópico. Se realmente quiser que seja excluído, envie um sinalizador para alertar a moderação, além dos argumentos."
         delete_topic_disallowed: "você não tem permissão para excluir este tópico"
+        delete_topic_confirm_modal:
+          one: "Atualmente este tópico tem mais de %{count} visualização e pode ser um destino de busca muito acessado. Tem certeza de que deseja excluir todo o tópico em vez de editar para melhorá-lo?"
+          other: "Atualmente este tópico tem mais de %{count} visualizações e pode ser um destino de busca muito acessado. Tem certeza de que deseja excluir todo o tópico em vez de editar para melhorá-lo?"
+        delete_topic_confirm_modal_yes: "Sim, excluir este tópico"
+        delete_topic_confirm_modal_no: "Não, manter este tópico"
+        delete_topic_error: "Ocorreu um erro ao excluir este tópico"
         delete_topic: "excluir tópico"
         add_post_notice: "Adicionar aviso da equipe"
+        change_post_notice: "Alterar aviso da equipe"
+        delete_post_notice: "Excluir aviso da equipe"
         remove_timer: "remover timer"
+        edit_timer: "editar timer"
       actions:
         people:
           like:
@@ -2535,6 +2823,7 @@ pt_BR:
           last: "Última revisão"
           hide: "Ocultar revisão"
           show: "Exibir revisão"
+          revert: "Reverter para a revisão %{revision}"
           edit_wiki: "Editar wiki"
           edit_post: "Editar postagem"
           comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong>/%{total}"
@@ -2567,6 +2856,7 @@ pt_BR:
         name: "Nome"
         name_placeholder: "Para que serve este favorito?"
         set_reminder: "Lembrar"
+        options: "Opções"
         actions:
           delete_bookmark:
             name: "Excluir favorito"
@@ -2574,19 +2864,26 @@ pt_BR:
           edit_bookmark:
             name: "Editar favorito"
             description: "Editar o nome do favorito ou alterar a data e hora do lembrete"
+          pin_bookmark:
+            name: "Fixar favoritos"
+            description: "Fixe o favorito. Isso fará que seja exibido no topo da sua lista de favoritos."
+          unpin_bookmark:
+            name: "Desafixar favoritos"
+            description: "Desafixe o favorito. Ele não será mais exibido no topo da sua lista de favoritos."
       filtered_replies:
         viewing_posts_by: "Vendo %{post_count} postagens de"
         viewing_subset: "Algumas respostas foram recolhidas"
         viewing_summary: "visualizando um resumo deste tópico"
+        post_number: "%{username}, postagem #%{post_number}"
         show_all: "Exibir tudo"
     category:
-      can: "pode&hellip; "
       none: "(sem categoria)"
       all: "Todas as categorias"
       choose: "categoria&hellip;"
       edit: "Editar"
       edit_dialog_title: "Editar: %{categoryName}"
       view: "Visualizar tópicos na categoria"
+      back: "Voltar para a categoria"
       general: "Geral"
       settings: "Configurações"
       topic_template: "Modelo de tópico"
@@ -2596,6 +2893,7 @@ pt_BR:
       tags_placeholder: "(Opcional) lista de etiquetas permitidas"
       tags_tab_description: "As etiquetas e grupos de etiquetas especificadas acima estarão disponíveis apenas nesta categoria e nas outras categorias que também as especificarem, sendo que não estarão disponíveis para uso em outras categorias."
       tag_groups_placeholder: "(Opcional) lista de grupos de etiquetas permitidos"
+      manage_tag_groups_link: "Gerenciar grupos de etiquetas"
       allow_global_tags_label: "Permitir também outras etiquetas"
       tag_group_selector_placeholder: "(Opcional) grupo de etiquetas"
       required_tag_group_description: "Exigir que novos tópicos tenham etiquetas de um grupo de etiquetas:"
@@ -2612,7 +2910,6 @@ pt_BR:
       save_error: Houve um erro ao salvar a categoria.
       name: "Nome da categoria"
       description: "Descrição"
-      topic: "tópico da categoria"
       logo: "Imagem do logotipo da categoria"
       background_image: "Imagem de fundo da categoria"
       badge_colors: "Cores do emblema"
@@ -2627,11 +2924,17 @@ pt_BR:
       change_in_category_topic: "Editar descrição"
       already_used: "Esta cor já foi usada para outra categoria"
       security: "Segurança"
+      security_add_group: "Adicionar a um grupo"
       permissions:
         group: "Grupo"
         see: "Ver"
         reply: "Responder"
         create: "Criar"
+        no_groups_selected: "Nenhum grupo recebeu acesso, esta categoria será visível apenas para a equipe."
+        everyone_has_access: 'Esta categoria é pública, todos(as) podem ver, responder e criar postagens. Para restringir permissões, remova uma ou mais permissões concedidas para o grupo "todos(as)".'
+        toggle_reply: "Alternar permissão de resposta"
+        toggle_full: "Alternar criação de permissão"
+        inherited: 'Esta permissão é herdada de "todos(as)"'
       special_warning: "Atenção: esta categoria é uma categoria pré-propagada, e as configurações de segurança não podem ser editadas. Se você não quer usar esta categoria, exclua em vez de reaproveitar."
       uncategorized_security_warning: "Esta categoria é especial. É destinada para tópicos que não têm categoria e não pode ter configurações de segurança."
       uncategorized_general_warning: 'Esta categoria é especial. Ela é usada como a categoria padrão para novos tópicos que não têm uma categoria selecionada. Se quiser evitar este comportamento e forçar a seleção da categoria, <a href="%{settingLink}">desative a configuração aqui</a>. Se você quiser alterar o nome ou a descrição, vá para <a href="%{customizeLink}">Personalização/Conteúdo de texto</a>.'
@@ -2647,12 +2950,15 @@ pt_BR:
       num_featured_topics: "Quantidade de tópicos exibidos na página de categorias:"
       subcategory_num_featured_topics: "Quantidade de tópicos em destaque na página da categoria pai:"
       all_topics_wiki: "Criar novos tópicos wikis por padrão"
+      allow_unlimited_owner_edits_on_first_post: "Permitir edições ilimitadas na primeira postagem"
       subcategory_list_style: "Estilo da lista de subcategorias"
       sort_order: "Classificar lista de tópicos por:"
       default_view: "Lista de tópicos padrão:"
       default_top_period: "Período superior padrão:"
+      default_list_filter: "Filtro de lista padrão:"
       allow_badges_label: "Permitir a concessão de emblemas nesta categoria"
       edit_permissions: "Editar permissões"
+      reviewable_by_group: "Além da equipe, o conteúdo desta categoria também pode ser revisado por:"
       review_group_name: "nome do grupo"
       require_topic_approval: "Requer aprovação dos moderadores(as) de todos os novos tópicos"
       require_reply_approval: "Requer aprovação dos moderadores(as) de todas as novas respostas"
@@ -2712,20 +3018,29 @@ pt_BR:
         moderation: "Moderação"
         appearance: "Aparência"
         email: "E-mail"
+      list_filters:
+        all: "todos os tópicos"
+        none: "nenhuma subcategoria"
+      colors_disabled: "Não é possível selecionar cores porque você tem um, ou não tem nenhum, estilo de categoria."
     flagging:
       title: "Obrigado por ajudar a tornar a nossa comunidade um ambiente seguro!"
       action: "Sinalizar resposta"
+      take_action: "Tomar medida..."
       take_action_options:
         default:
           title: "Tomar medida"
           details: "Atingir o limite de denuncias imediatamente em vez de esperar por mais denuncias da comunidade"
         suspend:
           title: "Suspender usuário(a)"
+          details: "Alcance o limite de sinalizadores e suspensa o(a) usuário(a)"
         silence:
           title: "Silenciar usuário(a)"
+          details: "Alcance o limite de sinalizadores e silencie o(a) usuário(a)"
       notify_action: "Mensagem"
       official_warning: "Aviso oficial"
       delete_spammer: "Excluir remetente de spam"
+      flag_for_review: "Fila para revisão"
+      delete_confirm_MF: "Você está prestes a excluir {POSTS, plural, one {<b>#</b> postagem} other {<b>#</b> postagens}} e {TOPICS, plural, one {<b>#</b> tópico} other {<b>#</b> tópicos}} deste(a) usuário(a), remover sua conta, bloquear cadastros a partir do seu endereço IP <b>{ip_address}</b> e adicionar seu endereço de e-mail <b>{email}</b> a uma lista de bloqueio permanente. Você tem certeza que este(a) usuário(a) é realmente um remetente de spam?"
       yes_delete_spammer: "Sim, excluir remetente de spam"
       ip_address_missing: "(N/D)"
       hidden_email_address: "(oculto)"
@@ -2792,6 +3107,12 @@ pt_BR:
         title: "Este tópico é uma mensagem pessoal"
         help: "Este tópico é uma mensagem pessoal"
     posts: "Postagens"
+    posts_likes_MF: |
+      Este tópico tem {count, plural, one {# resposta} other {# respostas}} {ratio, select,
+        low {com uma alta taxa de postagns para curtidas}
+        med {com uma alta muito alta de postagens para curtidas}
+        high {com uma taxa extremamente alta de taxa de postagens para curtidas}
+        other {}}
     original_post: "Postagem original"
     views: "Visualizações"
     views_lowercase:
@@ -2811,6 +3132,7 @@ pt_BR:
       one: "usuário(a)"
       other: "usuários(as)"
     category_title: "Categoria"
+    history: "Histórico, últimas 100 revisões"
     changed_by: "de %{author}"
     raw_email:
       title: "E-mails recebidos"
@@ -2885,6 +3207,7 @@ pt_BR:
         this_week: "Semana"
         today: "Hoje"
         other_periods: "ver melhores:"
+    browser_update: 'Infelizmente, <a href="https://www.discourse.org/faq/#browser">seu navegador é muito antigo para funcionar neste site</a>. <a href="https://browsehappy.com">Atualize seu navegador</a> para visualizar um conteúdo interessante, entrar com a conta e responder.'
     permission_types:
       full: "Criar/Responder/Ver"
       create_post: "Responder/Ver"
@@ -2897,6 +3220,7 @@ pt_BR:
       close: "Fechar (Esc)"
       content_load_error: '<a href="%url%">O conteúdo</a> não pôde ser carregado.'
       image_load_error: '<a href="%url%">A imagem</a> não pôde ser carregada.'
+    cannot_render_video: Este vídeo não pode ser renderizado porque o seu navegador não é compatível com o codec.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ","
       shortcut_key_delimiter_plus: "+"
@@ -2916,6 +3240,8 @@ pt_BR:
         profile: "%{shortcut} Perfil"
         messages: "%{shortcut} Mensagens"
         drafts: "%{shortcut} Rascunhos"
+        next: "%{shortcut} próximo tópico"
+        previous: "%{shortcut} tópico anterior"
       navigation:
         title: "Navegação"
         jump: "%{shortcut} Ir para a postagem #"
@@ -2933,6 +3259,7 @@ pt_BR:
         show_incoming_updated_topics: "%{shortcut} Exibir tópicos atualizados"
         search: "%{shortcut} Procurar"
         help: "%{shortcut} Abrir ajuda de teclado"
+        dismiss_new: "%{shortcut} descartar novos(as)"
         dismiss_topics: "%{shortcut} Descartar tópicos"
         log_out: "%{shortcut} Sair"
       composing:
@@ -3010,6 +3337,9 @@ pt_BR:
           name: Outros(as)
         posting:
           name: Publicando
+      favorite_max_reached: "Não é possível adicionar mais emblemas aos favoritos."
+      favorite_max_not_reached: "Marcar este emblema com o favorito"
+      favorite_count: "%{count}/%{max} emblemas marcados como favoritos"
     tagging:
       all_tags: "Todas as etiquetas"
       other_tags: "Outras etiquetas"
@@ -3019,6 +3349,7 @@ pt_BR:
       tags: "Etiquetas"
       choose_for_topic: "etiquetas opcionais"
       info: "Informações"
+      default_info: "Esta etiqueta não é restrita a nenhuma categoria nem tem sinônimos. Para adicionar restrições, coloque esta etiqueta em um a <a href=%{basePath}/tag_groups>grupo de etiquetas</a>."
       category_restricted: "Essa tag é restrita a categorias que você não tem permissão para acessar."
       synonyms: "Sinônimos"
       synonyms_description: "Quando as seguintes etiquetas forem usadas, serão substituídas por <b>%{base_tag_name}</b>."
@@ -3062,6 +3393,8 @@ pt_BR:
       delete_unused_confirmation_more_tags:
         one: "%{tags} e mais %{count}"
         other: "%{tags} e mais %{count}"
+      delete_no_unused_tags: "Não há etiquetas não usadas."
+      tag_list_joiner: ", "
       delete_unused: "Excluir etiquetas não usadas"
       delete_unused_description: "Excluir todas as etiquetas que não foram anexadas a nenhum tópico ou mensagens pessoais"
       cancel_delete_unused: "Cancelar"
@@ -3088,15 +3421,29 @@ pt_BR:
           description: "Você não receberá nenhuma notificação sobre novos tópicos com esta etiqueta, e eles não serão exibidos na aba de não lidos."
       groups:
         title: "Grupos de etiquetas"
+        about_heading: "Selecione um grupo de etiquetas ou crie uma nova"
+        about_heading_empty: "Crie um novo grupo de etiquetas para começar"
+        about_description: "Grupos de etiquetas ajudam a gerenciar permissões de várias etiquetas em um lugar."
         new: "Novo grupo"
+        new_title: "Criar novo grupo"
+        edit_title: "Editar grupo de etiquetas"
+        tags_label: "Etiquetas neste grupo"
+        parent_tag_label: "Etiqueta pai"
+        parent_tag_description: "As etiquetas deste grupo podem ser usadas apenas se a etiqueta pai estiver presente."
         one_per_topic_label: "Limite de uma etiqueta por tópico deste grupo"
         new_name: "Novo grupo de etiquetas"
+        name_placeholder: "Nome"
         save: "Salvar"
         delete: "Excluir"
         confirm_delete: "Tem certeza de que deseja excluir este grupo de etiquetas?"
         everyone_can_use: "Etiquetas podem ser usadas por todos(as)"
         usable_only_by_groups: "Etiquetas são visíveis para todos(as), mas somente os seguintes grupos podem usá-las"
         visible_only_to_groups: "As etiquetas são visíveis somente para os seguintes grupos"
+        cannot_save: "Não é possível salvar grupo de etiquetas. Verifique se há pelo menos uma etiqueta presente, o nome do grupo de etiquetas não está vazio e um grupo foi selecionado para permissão de etiquetas."
+        tags_placeholder: "Pesquisar ou criar etiquetas"
+        parent_tag_placeholder: "Opcional"
+        select_groups_placeholder: "Selecionar grupos..."
+        disabled: "A marcação com etiqueta está desativada. "
       topics:
         none:
           unread: "Você não tem tópicos não lidos."
@@ -3109,9 +3456,11 @@ pt_BR:
     invite:
       custom_message: "Torne o seu convite um pouco mais pessoal escrevendo uma <a href>mensagem personalizada</a>."
       custom_message_placeholder: "Digite a sua mensagem personalizada"
+      approval_not_required: "O(a) usuário(a) será aprovado(a) automaticamente assim que aceitar este convite."
       custom_message_template_forum: "Ei, você tem que entrar neste fórum!"
       custom_message_template_topic: "Ei, acho que você vai gostar deste tópico!"
     forced_anonymous: "Devido à quantidade de acessos, o conteúdo está sendo exibido temporariamente para todos(as) como se fossem um(a) usuário(a) que não entrou com a conta."
+    forced_anonymous_login_required: "O site está congestionado e não pode ser carregado neste momento, tente novamente em alguns minutos."
     footer_nav:
       back: "Voltar"
       forward: "Avançar"
@@ -3119,6 +3468,7 @@ pt_BR:
       dismiss: "Descartar"
     safe_mode:
       enabled: "O modo seguro está ativado. Para sair do modo seguro, feche a janela do navegador"
+    image_removed: "(imagem removida)"
     do_not_disturb:
       title: "Não perturbe por..."
       label: "Não perturbe"
@@ -3129,6 +3479,7 @@ pt_BR:
         two_hours: "2 horas"
         tomorrow: "Até amanhã"
         custom: "Personalizado(a)"
+      set_schedule: "Definir agendamento de notificação"
     trust_levels:
       names:
         newuser: "usuário(a) novo(a)"
@@ -3136,6 +3487,9 @@ pt_BR:
         member: "membro"
         regular: "regular"
         leader: "líder"
+      detailed_name: "%{level}: %{name}"
+    pick_files_button:
+      unsupported_file_picked: "Você escolheu um arquivo incompatível. Tipos de arquivos compatíveis: %{types}."
   admin_js:
     type_to_filter: "Digite para filtrar..."
     admin:
@@ -3166,6 +3520,7 @@ pt_BR:
         new_features:
           title: "\U0001F381 Novos recursos"
           dismiss: "Descartar"
+          learn_more: "Saiba mais"
         last_checked: "Última verificação"
         refresh_problems: "Atualizar"
         no_problems: "Nenhum problema foi encontrado."
@@ -3231,6 +3586,7 @@ pt_BR:
           trending_search:
             more: '<a href="%{basePath}/admin/logs/search_logs">Registros de pesquisa</a>'
             disabled: 'O relatório de pesquisa de conteúdo em alta está desativado. Ative as <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">consultas de pesquisa de registro</a> para coletar dados.'
+          average_chart_label: Média
           filters:
             file_extension:
               label: Extensão de arquivo
@@ -3261,6 +3617,8 @@ pt_BR:
               title: "Quem pode ver este grupo?"
               public: "Todos(as)"
               logged_on_users: "Usuários(as) conectados(as)"
+              members: "Moderadores(as), membros e proprietários(as) de grupo"
+              staff: "Moderadores(as) e proprietários(as) de grupo"
               owners: "Proprietários(as) do grupo"
               description: "Administradores(as) podem ver todos os grupos."
             members_visibility_levels:
@@ -3273,6 +3631,9 @@ pt_BR:
             effects: Efeitos
             trust_levels_none: "Nenhum"
             automatic_membership_email_domains: "Os(as) usuários(as) que se cadastrarem em um domínio de e-mail que corresponda exatamente a um nesta lista serão adicionados(as) automaticamente a este grupo:"
+            automatic_membership_user_count:
+              one: "%{count} usuário(a) tem os novos domínios de e-mail e será adicionado(a) ao grupo."
+              other: "%{count} usuários(as) tem os novos domínios de e-mail e serão adicionados(as) ao grupo."
             primary_group: "Definido automaticamente como grupo principal"
         name_placeholder: "Nome do grupo, sem espaços, igual à regra de nome do(a) usuário(a)"
         primary: "Grupo primário"
@@ -3284,7 +3645,11 @@ pt_BR:
         group_members: "Membros do grupo"
         delete: "Apagar"
         delete_confirm: "Apagar este grupos?"
+        delete_with_messages_confirm:
+          one: "Excluir este grupo fará com que %{count} mensagem fiquem órfãs, os membros do grupo não poderão mais acessá-la.<br><br>Deseja prosseguir?"
+          other: "Excluir este grupo fará com que %{count} mensagens fiquem órfãs, os membros do grupo não poderão mais acessá-la.<br><br>Deseja prosseguir?"
         delete_failed: "Não é possível excluir o grupo. Se for um grupo automático, não poderá ser desfeito."
+        delete_automatic_group: Este é um grupo automático e não pode ser excluído.
         delete_owner_confirm: "Remover privilégio de proprietário(a) de \"%{username}\"?"
         add: "Adicionar"
         custom: "Personalizado(a)"
@@ -3323,10 +3688,41 @@ pt_BR:
         save: Salvar
         new_key: Nova chave de API
         revoked: Revogado(a)
+        delete: Excluir permanentemente
         not_shown_again: Esta chave não será exibida novamente. Faça uma cópia antes de continuar.
         continue: Continuar
+        use_global_key: Chave global (permite todas as ações)
         scopes:
+          description: |
+            Ao usar escopos, é possível restringir uma chave de API a um conjunto específico de pontos de extremidade.
+            Você também pode definir quais parâmetros serão permitidos. Use vírgulas para separar diversos valores.
+          title: Escopos
+          resource: Recurso
           action: Ação
+          allowed_parameters: Parâmetros restritos
+          optional_allowed_parameters: Parâmetros permitidos (opcional)
+          any_parameter: (qualquer parâmetro)
+          allowed_urls: URLs permitidas
+          descriptions:
+            topics:
+              read: Leia um tópico ou uma postagem específica nele. RSS também é compatível.
+              write: Crie um novo tópico ou poste em algum que já existe.
+              read_lists: Leia listas de tópico como melhores, novidades, mais recentes. RSS também é compatível.
+              wordpress: Necessário para que o plug-in wp-discourse do WordPress funcione.
+            posts:
+              edit: Edite qualquer postagem ou especifique uma.
+            users:
+              bookmarks: Liste os favoritos dos(as) usuários(as). Retorna lembretes de favoritos ao usar o formato ICS.
+              sync_sso: Sincronize um(a) usuário(a) com o DiscourseConnect.
+              show: Obtenha informações sobre um(a) usuário(a).
+              check_emails: Liste e-mails de usuário(a).
+              update: Atualize as informações de perfil do(a) usuário(a).
+              log_out: Saia de todas as sessões do(a) usuário(a).
+              anonymize: Torne anônimas contas do(a) usuário(a).
+              delete: Excluir contas de usuário(as).
+              list: Obtenha uma lista de usuários(as).
+            email:
+              receive_emails: Combine este escopo com o destinatário(a) para processar e-mails recebidos.
       web_hooks:
         title: "Webhooks"
         none: "Não existem webhooks no momento."
@@ -3341,6 +3737,7 @@ pt_BR:
         go_back: "Voltar para a lista"
         payload_url: "URL do conteúdo"
         payload_url_placeholder: "https://example.com/postreceive"
+        warn_local_payload_url: "Parece que você está tentando configurar um webhook para uma URL local. Eventos entregues a endereços locais podem causar efeitos colaterais ou comportamentos inesperados. Continuar?"
         secret_invalid: "O segredo não deve conter caracteres em branco."
         secret_too_short: "O segredo deve ter pelo menos 12 caracteres."
         secret_placeholder: "Uma linha opcional, usado para gerar a assinatura"
@@ -3368,6 +3765,7 @@ pt_BR:
           details: "Quando existir uma resposta nova, edição, exclusão ou recuperação."
         user_event:
           name: "Evento do(a) usuário(a)"
+          details: "Quando um(a) usuário(a) entrar com a conta e sair, confirma seu e-mail, é criada, aprovada ou atualizada."
         group_event:
           name: "Evento de grupo"
           details: "Quando um grupo é criado, atualizado ou desfeito."
@@ -3386,6 +3784,9 @@ pt_BR:
         user_badge_event:
           name: "Evento de concessão de emblema"
           details: "Quando um(a) usuário(a) recebe um emblema."
+        group_user_event:
+          name: "Evento de usuário(a) em grupo"
+          details: "Quando um(a) usuário(a) for adicionado(a) ou removido(a) em um grupo."
         like_event:
           name: "Evento de curtida"
           details: "Quando um usuário curte uma postagem."
@@ -3534,6 +3935,7 @@ pt_BR:
           theme: "Tema"
           component: "Componente"
           components: "Componentes"
+          filter_placeholder: "Digite para filtrar..."
           theme_name: "Nome do tema"
           component_name: "Nome do componente"
           themes_intro: "Selecione um tema existente ou instale um novo para começar"
@@ -3566,7 +3968,10 @@ pt_BR:
           hide_unused_fields: "Ocultar campos não usados"
           is_default: "O tema está ativado por padrão"
           user_selectable: "O tema pode ser selecionado pelos(as) usuários(as)"
+          color_scheme_user_selectable: "O esquema de cores pode ser selecionado pelos(as) usuários(as)"
+          auto_update: "Atualizar automaticamente quando o Discourse for atualizado"
           color_scheme: "Paleta de cores"
+          default_light_scheme: "Claro (padrão)"
           color_scheme_select: "Selecione as cores que serão usadas pelo tema"
           custom_sections: "Seções personalizadas:"
           theme_components: "Componentes do tema"
@@ -3574,7 +3979,9 @@ pt_BR:
           convert: "Converter"
           convert_component_alert: "Você tem certeza de que deseja converter este componente em tema? Ele será removido como um componente de %{relatives}."
           convert_component_tooltip: "Converter este componente em tema"
+          convert_component_alert_generic: "Tem certeza de que quer converter este componente em um tema?"
           convert_theme_alert: "Você tem certeza de que deseja converter este tema em componente? Ele será removido como um pai de %{relatives}."
+          convert_theme_alert_generic: "Tem certeza de que quer converter este tema em um componente?"
           convert_theme_tooltip: "Converter este tema em componente"
           inactive_themes: "Temas inativos:"
           inactive_components: "Componentes não usados"
@@ -3608,17 +4015,20 @@ pt_BR:
           included_components: "Componentes incluídos"
           add_all: "Adicionar tudo"
           import_web_tip: "Repositório contendo tema"
+          direct_install_tip: "Tem certeza de que quer instalar <strong>%{name}</strong> do repositório listado abaixo?"
           import_web_advanced: "Avançado…"
           import_file_tip: "Arquivo .tar.gz, .zip ou .dcstyle.json com o tema"
           is_private: "O tema está em um repositório git privado"
           remote_branch: "Nome da unidade (opcional)"
           public_key: "Conceder o seguinte acesso da chave pública ao repo:"
+          public_key_note: "Após digitar uma URL do repositório privada válida, uma chave SSH será gerada e exibida aqui."
           install: "Instalar"
           installed: "Instalado(a)"
           install_popular: "Mais acessados(as)"
           install_upload: "Do seu dispositivo"
           install_git_repo: "De um repositório git"
           install_create: "Criar novo(a)"
+          duplicate_remote_theme: "O componente do tema \"%{name}\" já está instalado, tem certeza de que deseja instalar outra cópia?"
           about_theme: "Sobre"
           license: "Licença"
           version: "Versão:"
@@ -3638,6 +4048,7 @@ pt_BR:
           check_for_updates: "Verificar atualizações"
           updating: "Atualizando..."
           up_to_date: "O tema está atualizado, última verificação:"
+          has_overwritten_history: "A versão atual do tema não existe mais porque o histórico de Git foi sobrescrito por um envio de push forçado."
           add: "Adicionar"
           theme_settings: "Configurações do tema"
           no_settings: "Este tema não tem configurações."
@@ -3647,6 +4058,7 @@ pt_BR:
             one: "O tema tem uma diferença de %{count} confirmação!"
             other: "O tema tem uma diferença de %{count} confirmações!"
           compare_commits: "(Ver novas confirmações)"
+          remote_theme_edits: "Se você quiser editar este tema, é preciso <a href='%{repoURL}' target='_blank'>enviar uma alteração em seu repositório</a>"
           repo_unreachable: "Não foi possível acessar o repositório Git deste tema. Mensagem de erro:"
           imported_from_archive: "Este tema foi importado de um arquivo .zip"
           scss:
@@ -3664,6 +4076,18 @@ pt_BR:
           embedded_scss:
             text: "CSS incorporado"
             title: "Insira o CSS personalizado para entregar com a versão incorporada dos comentários"
+          color_definitions:
+            text: "Definições de cor"
+            title: "Digite definições de cor personalizadas (apeans usuários(as) avançados(as))"
+            placeholder: |2-
+
+              Use esta folha de estilo para adicionar cores personalizadas à lista de propriedades personalizadas do CSS.
+
+              Por exemplo:
+
+              %{example}
+
+              É altamente recomendável adicionar os nomes das propriedades ao prefixo para evitar conflitos com plug-ins e/ou núcleo.
           head_tag:
             text: "</head>"
             title: "O HTML que será inserido antes da</head> etiqueta"
@@ -3673,6 +4097,8 @@ pt_BR:
           yaml:
             text: "YAML"
             title: "Definir configurações de tema no formato YAML"
+          scss_color_variables_warning: 'Usar variáveis de cor SCSS nos temas foi preterido. Use as propriedades personalizadas do CSS. Consulte <a href="https://meta.discourse.org/t/-/77551#color-variables-2" target="_blank">este guia</a> para obter mais detalhes.'
+          scss_warning_inline: "Usar variáveis de cor SCSS nos temas foi preterido."
         colors:
           select_base:
             title: "Selecionar paleta de cores básicas"
@@ -3691,6 +4117,10 @@ pt_BR:
           primary:
             name: "primário(a)"
             description: "Maioria dos textos, ícones e bordas."
+          primary-medium:
+            name: "primária, média"
+          primary-low-mid:
+            name: "primária, baixa, intermediária"
           secondary:
             name: "secundário(a)"
             description: "As cores de fundo principais e do texto de alguns botões."
@@ -3709,6 +4139,12 @@ pt_BR:
           highlight:
             name: "destaque"
             description: "A cor de fundo dos elementos em destaque na página, como postagens e tópicos."
+          highlight-high:
+            name: "destaque, alta"
+          highlight-medium:
+            name: "destaque, média"
+          highlight-low:
+            name: "destaque, baixa"
           danger:
             name: "perigo"
             description: "Cor de destaque para ações como remover postagens e tópicos."
@@ -3894,6 +4330,7 @@ pt_BR:
             post_edit: "edição de postagem"
             post_unlocked: "postagem desbloqueada"
             check_personal_message: "verificar mensagem pessoal"
+            disabled_second_factor: "desativar a autenticação de dois fatores"
             topic_published: "tópico publicado"
             post_approved: "postagem aprovada"
             post_rejected: "postagem rejeitada"
@@ -3923,7 +4360,18 @@ pt_BR:
             override_upload_secure_status: "substituir status seguro do envio"
             page_published: "página publicada"
             page_unpublished: "publicação de página cancelada"
+            add_email: "adicionar e-mail"
+            update_email: "atualizar e-mail"
+            destroy_email: "destruir e-mail"
+            topic_closed: "tópico fechado"
+            topic_opened: "tópico aberto"
+            topic_archived: "tópico arquivado"
+            topic_unarchived: "tópico desarquivado"
+            post_staff_note_create: "adicionar nota para equipe"
+            post_staff_note_destroy: "destruir nota para equipe"
             delete_group: "excluir grupo"
+            watched_word_create: "adicionar palavra acompanhada"
+            watched_word_destroy: "excluir palavra acompanhada"
         screened_emails:
           title: "E-mails filtrados"
           description: "Quando alguém tentar criar uma conta nova, os seguintes endereços de e-mail serão verificados e o registro será bloqueado, ou outra ação será executada."
@@ -3937,6 +4385,7 @@ pt_BR:
           domain: "Domínio"
         screened_ips:
           title: "IPs filtrados"
+          description: 'Endereços IP que estão sendo observados. Use "Permitir" para adicionar endereços IP à lista de permissões.'
           delete_confirm: "Tem certeza que deseja remover a regra para %{ip_address}?"
           roll_up_confirm: "Tem certeza que deseja acumular endereços IP filtrados comuns em subnets?"
           rolled_up_some_subnets: "Entradas de IP banidos acumulados nestas subnets: %{subnets}."
@@ -3970,14 +4419,21 @@ pt_BR:
         title: "Palavras acompanhadas"
         search: "pesquisa"
         clear_filter: "Limpar"
+        show_words:
+          one: "exibir %{count} palavra"
+          other: "exibir %{count} palavras"
         download: Download
         clear_all: Limpar tudo
+        clear_all_confirm: "Tem certeza de que deseja remover todas as palavras acompanhadas para a ação %{action}?"
+        invalid_regex: 'A palavra companhada ''%{word}" é uma expressão regular inválida.'
+        regex_warning: '<a href="%{basePath}/admin/site_settings/category/all_results?filter=watched%20words%20regular%20expressions%20">Palavras acompanhadas são expressões regulares</a> e não incluem automaticamente limites de palavras. Se quiser usar expressões regulares para fazer correpondência a palavras inteiras, inclua <code>\b</code> no início e no fim da sua expressão regular.'
         actions:
           block: "Bloqueado(a)"
           censor: "Censurar"
           require_approval: "Requerer aprovação"
           flag: "Sinalizar"
           replace: "Substituir"
+          tag: "Etiqueta"
           silence: "Silenciar"
           link: "Vincular"
         action_descriptions:
@@ -3985,8 +4441,17 @@ pt_BR:
           censor: "Permita postagens contendo essas palavras, mas substitua-as por caracteres que ocultem as palavras censuradas."
           require_approval: "As postagens contendo essas palavras exigirão aprovação da equipe antes que possam ser vistas."
           flag: "Permita postagens contendo estas palavras, mas sinalize-as como impróprias para que a moderação possa analisá-las."
+          replace: "Substituir palavras em postagens com outras palavras"
+          tag: "Etiquete tópicos automaticamente conforme a primeira postagem"
+          silence: "As primeiras postagens de usuários(as) com estas palavras precisarão de aprovação da equipe antes que sejam exibidas e o(a) usuário(a) será silenciado(a) automaticamente."
+          link: "Substitua palavras em postagens por links"
         form:
+          label: "Tem palavra ou frase"
+          placeholder: "Digite uma palavra ou frase (* é um curinga)"
           placeholder_regexp: "expressão regular"
+          replace_label: "Substituição"
+          replace_placeholder: "exemplo"
+          tag_label: "Etiqueta"
           link_label: "Link"
           link_placeholder: "https://example.com"
           add: "Adicionar"
@@ -3996,6 +4461,7 @@ pt_BR:
           upload_successful: "Envio bem-sucedido. As palavras foram adicionadas."
         test:
           button_label: "Testar"
+          modal_title: "%{action}: testar palavras acompanhadas"
           description: "Digite o texto abaixo para verificar as correspondências com palavras acompanhadas"
           found_matches: "Correspondências encontradas:"
           no_matches: "Nenhuma correspondência encontrada"
@@ -4041,6 +4507,7 @@ pt_BR:
           title: "Mostrar endereço de e-mail deste(a) usuário(a)"
           text: "Exibir"
         check_sso:
+          title: "Revelar conteúdo do SSO"
           text: "Exibir"
       user:
         suspend_failed: "Algo deu errado ao suspender este(a) usuário(a) %{error}"
@@ -4050,6 +4517,13 @@ pt_BR:
         suspend_reason_hidden_label: "Por que você está suspendendo? Este texto será exibido para o(a) usuário(a) quando tentar entrar. Seja breve."
         suspend_reason: "Motivo"
         suspend_reason_title: "Motivo da suspensão"
+        suspend_reasons:
+          not_listening_to_staff: "Não dava atenção aos comentários da equipe"
+          consuming_staff_time: "Consumia uma quantidade desproporcional de tempo da equipe"
+          combative: "Muito agressivo(a)"
+          in_wrong_place: "No lugar errado"
+          no_constructive_purpose: "Nenhum propósito construtivo em suas ações, exceto criar discórdia na comunidade"
+          custom: "Personalizado..."
         suspend_message: "Mensagem de e-mail"
         suspend_message_placeholder: "Opcionalmente, forneça mais informações sobre a suspensão e elas serão enviadas para o(a) usuário(a) por e-mail."
         suspended_by: "Suspenso(a) por"
@@ -4072,9 +4546,11 @@ pt_BR:
         penalty_post_edit: "Editar a postagem"
         penalty_post_none: "Não fazer nada"
         penalty_count: "Contagem de penalidades"
+        penalty_history: "Histórico de penalidades"
         clear_penalty_history:
           title: "Limpar histórico de penalidades"
           description: "usuários(as) com penalidades não podem alcançar TL3"
+        delete_all_posts_confirm_MF: "Você está prestes a excluir {POSTS, plural, one {# postagem} other {# postagens}} e {TOPICS, plural, one {# tópico} other {# tópicos}}. Deseja prosseguir?"
         silence: "Silenciar"
         unsilence: "Ativar som"
         silenced: "Silenciado(a)?"
@@ -4107,10 +4583,13 @@ pt_BR:
         private_topics_count: Tópicos privados
         posts_read_count: Postagens lidas
         post_count: Postagens criadas
+        second_factor_enabled: Autenticação de dois fatores ativada
         topics_entered: Tópicos visualizados
         flags_given_count: Sinalizações dadas
         flags_received_count: Sinalizações recebidas
         warnings_received_count: Avisos recebidos
+        warnings_list_warning: |
+          Na função de moderador(a), talvez você não consiga visualizar todos estes tópicos. Caso seja necessário, peça a um(a) administrador(a) ou ao(à) moderador(a) emissor(a) que dê acesso às mensagens a <b>@moderators</b> .
         flags_given_received_count: "Sinalizações dadas/recebidas"
         approve: "Aprovar"
         approved_by: "aprovado(a) por"
@@ -4136,6 +4615,8 @@ pt_BR:
             target_username_placeholder: "Nome do(a) usuário(a) do(a) novo(a) proprietário(a)"
             transfer_and_delete: "Transferir e excluir @%{username}"
             cancel: "Cancelar"
+          progress:
+            title: "Progresso da mesclagem"
           confirmation:
             title: "Transferir e excluir @%{username}"
             description: |
@@ -4199,6 +4680,9 @@ pt_BR:
         trust_level_unlocked_tip: "o nível de confiança está desbloqueado, o sistema poderá promover ou rebaixar o(a) usuário(a)"
         lock_trust_level: "Bloquear nível de confiança"
         unlock_trust_level: "Desbloquear nível de confiança"
+        silenced_count: "Silenciado(a)"
+        suspended_count: "Suspenso(a)"
+        last_six_months: "Últimos seis meses"
         tl3_requirements:
           title: "Requisitos para o nível de confiança 3"
           table_title:
@@ -4229,11 +4713,15 @@ pt_BR:
           locked_will_not_be_promoted: "Nível de confiança bloqueado. Nunca será promovido(a)."
           locked_will_not_be_demoted: "Nível de confiança bloqueado(a). Nunca será rebaixado(a)."
         discourse_connect:
+          title: "Entrada única no DiscourseConnect"
           external_id: "ID externa"
           external_username: "Nome do(a) usuário(a)"
           external_name: "Nome"
           external_email: "E-mail"
           external_avatar_url: "URL da imagem do perfil"
+          last_payload: "Último conteúdo"
+          delete_sso_record: "Excluir registro SSO"
+          confirm_delete: "Tem certeza de que gostaria de excluir este registro do DiscourseConnect?"
       user_fields:
         title: "Campos de usuário(a)"
         help: "Adicionar campos que seus(suas) usuários(as) podem preencher."
@@ -4272,6 +4760,7 @@ pt_BR:
           text: "Campo de texto"
           confirm: "Confirmação"
           dropdown: "Menu suspenso"
+          multiselect: "Multisseleção"
       site_text:
         description: "Você pode personalizar qualquer parte do texto em seu fórum. Comece pesquisando abaixo:"
         search: "Pesquise o texto que você gostaria de editar"
@@ -4282,12 +4771,19 @@ pt_BR:
         go_back: "Voltar para pesquisa"
         recommended: "Recomendamos personalizar o texto a seguir para atender às suas necessidades:"
         show_overriden: "Exibir apenas substituídos"
+        locale: "Idioma:"
+        fallback_locale_warning: "Você está editando um idioma com base em %{fallback}. Os(as) usuários(as) que escolherem %{fallback} como idioma de interface não visualizarão suas alterações."
         more_than_50_results: "Existem mais de 50 resultados. Refine sua pesquisa."
       settings:
         show_overriden: "Exibir apenas substituídos"
+        history: "Visualizar histórico de alterações"
         reset: "redefinir"
         none: "nenhum(a)"
       site_settings:
+        emoji_list:
+          invalid_input: "A lista de emojis deve conter apenas nomes de emoji válidos, por exemplo: abraços"
+          add_emoji_button:
+            label: "Adicionar emoji"
         title: "Configurações"
         no_results: "Nenhum resultado encontrado."
         more_than_30_results: "Existem mais de 30 resultados. Refine sua pesquisa ou selecione uma categoria."
@@ -4338,6 +4834,11 @@ pt_BR:
           modal_description: "Você gostaria de aplicar esta alteração historicamente? Isto mudará as preferências de %{count} usuários(as) existentes."
           modal_yes: "Sim"
           modal_no: "Não, apenas aplique alterações daqui para frente"
+        simple_list:
+          add_item: "Adicionar item..."
+        json_schema:
+          edit: Iniciar editor
+          modal_title: "Editar %{name}"
       badges:
         title: Emblemas
         new_badge: Novo emblema
@@ -4374,7 +4875,12 @@ pt_BR:
         enabled: Ativar emblema
         icon: Ícone
         image: Imagem
+        graphic: Gráfico
         icon_help: "Digite um nome de ícone do tipo Font Awesome (use o prefixo \"far-\" para ícones comuns e \"fab-\" para ícones de marca)"
+        image_help: "Enviar uma imagem substitui o campo do ícone se ambos estiverem definidos."
+        select_an_icon: "Selecione um ícone"
+        upload_an_image: "Enviar uma imagem"
+        read_only_setting_help: "Personalizar texto"
         query: Badge Query (SQL)
         target_posts: Consultar postagens de destino
         auto_revoke: Rodar consulta de revogação todos os dias
@@ -4418,8 +4924,11 @@ pt_BR:
           perform: "Conceder emblema a usuários(as)"
           upload_csv: Enviar um CSV com e-mails ou nomes de usuário(a)
           aborted: Envie um CSV contendo e-mails ou nomes de usuário(a)
-          success: Seu CSV foi recebido e os(as) usuários(as) receberão seus emblemas em breve.
+          success: Seu CSV foi recebido e %{count} usuários(as) receberão seu emblema em breve.
+          csv_has_unmatched_users: "As entradas a seguir estão no arquivo CSV, mas não corresponderam a nenhum(a) usuário(a) existente e por isso não receberão o emblema:"
+          csv_has_unmatched_users_truncated_list: "Haviam %{count} entradas no arquivo CSV que não corresponderam a nenhum(a) usuário(a) e por isso não receberam o emblema. Devido à grande quantidade de entradas sem correspondência, apenas as primeiras são exibidas:"
           replace_owners: Remover o emblema dos(as) proprietários(as) anteriores
+          grant_existing_holders: Conceder emblemas adicionais a titulares de emblema existentes
       emoji:
         title: "Emoji"
         help: "Adicionar novo emoji que estará disponível para todos(as). (DICA: arraste e solte diversos arquivos de uma vez)"
@@ -4437,6 +4946,7 @@ pt_BR:
         title: "Incorporar"
         host: "Hosts permitidos"
         class_name: "Nome da classe"
+        allowed_paths: "Caminho Allowlist"
         edit: "editar"
         category: "Postar na categoria"
         add_host: "Adicionar host"
@@ -4462,7 +4972,10 @@ pt_BR:
         post_title: "Mensagem"
         category_id: "ID da categoria"
         category_title: "Categoria"
+        tag_name: "Nome da etiqueta"
+        external_url: "URL externa ou relacionada"
         destination: "Destino"
+        copy_to_clipboard: "Copiar permalink para a área de transferência"
         delete_confirm: Você tem certeza que quer excluir este link permanente?
         form:
           label: "Novo:"
@@ -4501,5 +5014,6 @@ pt_BR:
           regular: "Usuário regular"
       previews:
         topic_title: "Tópico de discussão"
+        font_title: "Fonte %{font}"
         share_button: "Compartilhar"
         reply_button: "Responder"
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index dfb4a18b18..5da7c057af 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -239,7 +239,6 @@ ro:
     conduct: "Codul de conduită"
     mobile_view: "Vedere pentru mobil"
     desktop_view: "Vedere pentru desktop"
-    you: "Tu"
     or: "sau"
     now: "Acum"
     read_more: "Citește mai mult"
@@ -323,7 +322,6 @@ ro:
       remove: "Eliminați"
       remove_confirmation: "Ești sigur că vrei să ștergi această ciornă?"
       new_topic: "Ciornă subiect nou"
-      new_private_message: "Ciornă mesaj privat nou"
       topic_reply: "Răspuns ciornă"
       abandon:
         confirm: "Ai o schiță în curs pentru acest subiect. Ce ai vrea să faci mai departe?"
@@ -716,8 +714,6 @@ ro:
         public: "Public"
         private: "Privat"
         public_groups: "Grupuri publice"
-        automatic_group: Grup automat
-        close_group: Grup închis
         my_groups: "Grupurile mele"
         group_type: "Tip grup"
         is_group_user: "Membru"
@@ -780,6 +776,8 @@ ro:
       flair_type:
         icon: "Alege o pictogramă"
         image: "Încarcă o imagine"
+      default_notifications:
+        modal_yes: "Da"
     user_action_groups:
       "1": "Aprecieri date"
       "2": "Aprecieri primite"
@@ -809,7 +807,6 @@ ro:
       posts: "Postări"
       topics: "Subiecte"
       latest: "Cele mai recente"
-      toggle_ordering: "Comută criteriu de aranjare"
       subcategories: "Subcategorii"
       muted: "Categorii dezactivate"
       topic_sentence:
@@ -1155,7 +1152,6 @@ ro:
         title: "Dispozitive folosite recent"
         details: "Detalii"
       last_posted: "Ultima postare"
-      last_emailed: "Ultimul email"
       last_seen: "Văzut "
       created: "Înscris"
       log_out: "Ieșire"
@@ -2177,8 +2173,6 @@ ro:
       whisper: "această postare este doar pentru moderatori (modul discret)"
       wiki:
         about: "această postare este un wiki"
-      archetypes:
-        save: "Opțiuni de salvare"
       few_likes_left: "Îți mulțumim că împărtășești aprecierea! Mai ai doar câteva aprecieri pentru azi."
       controls:
         reply: "începe să scrii un răspuns pentru această postare"
@@ -2278,6 +2272,7 @@ ro:
         name: "Nume"
         name_placeholder: "Pentru ce este acest semn de carte?"
         set_reminder: "Aminteşte-mi"
+        options: "Opțiuni"
         actions:
           delete_bookmark:
             name: "Ștergere semn de carte"
@@ -2292,7 +2287,6 @@ ro:
             name: "Anulează fixarea semnului de carte"
             description: "Anulează fixarea semnului de carte. Acesta nu va mai apărea în partea de sus a listei de semne de carte."
     category:
-      can: "can&hellip; "
       none: "(nicio categorie)"
       all: "Toate categoriile"
       edit: "Editează"
@@ -2314,7 +2308,6 @@ ro:
       save_error: A apărut o eroare in timpul salvării categoriei.
       name: "Numele categoriei"
       description: "Descriere"
-      topic: "Subiectul categoriei"
       logo: " Logo pentru categorie"
       background_image: "Imaginea de fundal a categoriei"
       badge_colors: "Culori de ecuson"
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 9dc936553a..084947773e 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -269,7 +269,6 @@ ru:
     conduct: "Кодекс поведения"
     mobile_view: "Для мобильных устройств"
     desktop_view: "Для настольных устройств"
-    you: "Вы"
     or: "или"
     now: "только что"
     read_more: "читать дальше"
@@ -438,7 +437,7 @@ ru:
         type_bonus:
           name: "Тип бонуса"
           title: "Некоторым проверяемым сообщениям сотрудник может назначить бонус, чтобы сделать их более приоритетными."
-      stale_help: "Проверка сообщения уже была выполнена кем-то другим."
+      stale_help: "Проверка сообщения уже была выполнена пользователем <b>%{username}</b>."
       claim_help:
         optional: "Вы можете зарезервировать этот контент за собой, чтобы другие не могли заняться его модерацией."
         required: "Вы должны зарезервировать контент за собой, прежде чем заняться его модерацией."
@@ -839,8 +838,6 @@ ru:
         public: "Публичные"
         private: "Приватные"
         public_groups: "Публичные группы"
-        automatic_group: Автоматическая группа
-        close_group: Закрытая группа
         my_groups: "Мои группы"
         group_type: "Тип группы"
         is_group_user: "Участник"
@@ -919,6 +916,11 @@ ru:
       flair_type:
         icon: "Выбрать иконку"
         image: "Загрузить картинку"
+      default_notifications:
+        modal_title: "Стандартные уведомления пользователя"
+        modal_description: "Хотели бы вы применить это изменение к уже существующим пользователям? Это изменит настройки для %{count} существующих пользователей."
+        modal_yes: "Да"
+        modal_no: "Нет, применить изменение только к будущим пользователям"
     user_action_groups:
       "1": "Симпатии"
       "2": "Симпатии"
@@ -948,7 +950,6 @@ ru:
       posts: "Сообщения"
       topics: "Темы"
       latest: "Последние"
-      toggle_ordering: "изменить сортировку"
       subcategories: "Подразделы"
       muted: "Разделы с отключёнными уведомлениями"
       topic_sentence:
@@ -1417,7 +1418,6 @@ ru:
         browser_active: '%{browser} | <span class="active">active now</span>'
         browser_last_seen: "%{browser} | %{date}"
       last_posted: "Последнее сообщение"
-      last_emailed: "Последнее письмо"
       last_seen: "Был"
       created: "Вступил"
       log_out: "Выйти"
@@ -2111,7 +2111,6 @@ ru:
           confirm: У вас есть сохранённый черновик новой темы, который будет перезаписан, если вы создадите связанную тему.
         reply_as_new_group_message:
           label: Ответить в виде нового группового сообщения
-          desc: Создать новое личное сообщение с теми же получателями
         reply_as_private_message:
           label: Личное сообщение
           desc: Создать новое личное сообщение
@@ -2436,13 +2435,6 @@ ru:
       defer:
         help: "Отметить как непрочитанное"
         title: "Отложить"
-      feature_on_profile:
-        help: "Добавьте ссылку на эту тему в карточку пользователя и профиль"
-        title: "Добавить в профиль"
-      remove_from_profile:
-        warning: "В вашем профиле уже есть избранная тема. Если вы продолжите, эта тема заменит существующую."
-        help: "Удалить ссылку на эту тему в вашем профиле "
-        title: "Убрать из профиля"
       list: "Темы"
       new: "новая тема"
       unread: "не прочитано"
@@ -2974,8 +2966,6 @@ ru:
       whisper: "Это скрытое сообщение и оно доступно только модераторам"
       wiki:
         about: "Это вики-сообщение"
-      archetypes:
-        save: "Параметры сохранения"
       few_likes_left: "Спасибо, что делитесь любовью. На сегодня у Вас осталось несколько лайков."
       controls:
         reply: "Начать составление ответа на сообщение"
@@ -3115,6 +3105,7 @@ ru:
         name: "Имя"
         name_placeholder: "Присвоить имя закладке (необязательно)"
         set_reminder: "Настроить напоминание (необязательно)"
+        options: "Настройки"
         actions:
           delete_bookmark:
             name: "Удалить закладку"
@@ -3135,7 +3126,6 @@ ru:
         post_number: "%{username}, сообщение #%{post_number}"
         show_all: "Показать все"
     category:
-      can: "может&hellip; "
       none: "(РАЗНОЕ)"
       all: "Все разделы"
       choose: "Выберите раздел&hellip;"
@@ -3169,7 +3159,6 @@ ru:
       save_error: При сохранении раздела возникла ошибка.
       name: "Название раздела"
       description: "Описание"
-      topic: "Тема раздела"
       logo: "Логотип раздела"
       background_image: "Фоновое изображение раздела"
       badge_colors: "Цвета наград"
@@ -3800,6 +3789,8 @@ ru:
         regular: "Активный"
         leader: "Лидер"
       detailed_name: "%{level}: %{name}"
+    pick_files_button:
+      unsupported_file_picked: "Вы выбрали неподдерживаемый тип файла. Поддерживаемые типы файлов: %{types}."
   admin_js:
     type_to_filter: "Фильтрация настроек..."
     admin:
@@ -4036,6 +4027,7 @@ ru:
               log_out: Завершение всех сессий пользователя.
               anonymize: Анонимизация учетных записей пользователей.
               delete: Удаление учетных записей пользователей.
+              list: Получение списка пользователей.
             email:
               receive_emails: Объединение этой области действия с получателем почты для обработки входящих писем.
       web_hooks:
@@ -4254,6 +4246,7 @@ ru:
           theme: "Тема"
           component: "Компонент"
           components: "Компоненты"
+          filter_placeholder: "Фильтрация настроек..."
           theme_name: "Название темы"
           component_name: "Название компонента"
           themes_intro: "Для начала выберите существующую тему или установите новую"
@@ -5248,8 +5241,11 @@ ru:
           perform: "Наградить пользователей"
           upload_csv: Загрузите файл в формате CSV с электронными адресами или псевдонимами пользователей
           aborted: Пожалуйста, загрузите файл в формате CSV, содержащий адреса электронной почты или псевдонимы пользователей.
-          success: Файл успешно загружен, пользователи получат награды в ближайшее время.
+          success: Файл успешно загружен и %{count} пользователей получат награды в ближайшее время.
+          csv_has_unmatched_users: "Следующие записи находятся в CSV-файле, но они не могут быть сопоставлены с существующими пользователями, поэтому указанные пользователи не получат награду:"
+          csv_has_unmatched_users_truncated_list: "В CSV-файле %{count} записей, которые не удалось сопоставить с существующими пользователями, поэтому эти пользователи не получат награду. Из-за большого количества несовпадающих записей отображаются только первые 100 значений:"
           replace_owners: Удалять эту награду у предыдущих владельцев
+          grant_existing_holders: Предоставление награждённым дополнительных наград
       emoji:
         title: "Эмодзи"
         help: "Добавить новые эмодзи, которые будут доступны всем. (Подсказка: можно перетаскивать несколько файлов за раз)"
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index e8c144144d..2a352d6a6d 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -238,7 +238,6 @@ sk:
     rules: "Pravidlá"
     mobile_view: "Mobilná verzia"
     desktop_view: "Zobrazenie pre počítač"
-    you: "Vy"
     or: "alebo"
     now: "práve teraz"
     read_more: "čítaj ďalej"
@@ -543,8 +542,6 @@ sk:
         public: "Verejné"
         private: "Súkromné"
         public_groups: "Verejné skupiny"
-        automatic_group: Automatická skúpina
-        close_group: Uzavrieť skupinu
         my_groups: "Moje skupiny"
         group_type: "Typ skupiny"
         is_group_user: "Člen"
@@ -600,6 +597,8 @@ sk:
       flair_color_placeholder: "(Voliteľné) Hexadecimálna hodnota farby"
       flair_preview_icon: "Ikona náhľadu"
       flair_preview_image: "Náhľad obrázku"
+      default_notifications:
+        modal_yes: "Áno"
     user_action_groups:
       "1": "Rozdaných 'páči sa mi'"
       "2": "Obdržaných 'páči sa mi'"
@@ -629,7 +628,6 @@ sk:
       posts: "Príspevky"
       topics: "Témy"
       latest: "Najnovšie"
-      toggle_ordering: "zmeniť radenie"
       subcategories: "Podkategórie"
       topic_sentence:
         one: "%{count} téma"
@@ -909,7 +907,6 @@ sk:
         log_out_all: "Odhlásiť všetky"
         secure_account: "Zabezpečiť moje konto"
       last_posted: "Posledný príspevok"
-      last_emailed: "Posledný odemailovaný"
       last_seen: "Videný"
       created: "Vytvorený"
       log_out: "Odhlásiť sa"
@@ -1780,8 +1777,6 @@ sk:
       whisper: "tento príspevok je súkromným šepotom pre moderátorov"
       wiki:
         about: "tento príspevok je wiki"
-      archetypes:
-        save: "Uložiť možnosti"
       controls:
         reply: "vytvorte odpoveď na tento príspevok"
         like: "páči sa mi tento príspevok"
@@ -1844,8 +1839,8 @@ sk:
       bookmarks:
         created: "Vytvorené"
         name: "Meno"
+        options: "Možnosti"
     category:
-      can: "môže &hellip; "
       none: "(Bez kategórie)"
       all: "Všetky kategórie"
       edit: "Upraviť"
@@ -1866,7 +1861,6 @@ sk:
       save_error: Nastala chyba počas ukladania kategórie
       name: "Názov kategórie"
       description: "Popis"
-      topic: "kategória témy"
       logo: "Logo kategórie"
       background_image: "Pozadie kategórie"
       badge_colors: "Farby odznakov"
diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml
index 3f4bd3f0ea..e8a7793048 100644
--- a/config/locales/client.sl.yml
+++ b/config/locales/client.sl.yml
@@ -261,7 +261,6 @@ sl:
     conduct: "Pravila obnašanja"
     mobile_view: "Mobilni pogled"
     desktop_view: "Namizni pogled"
-    you: "Vi"
     or: "ali"
     now: "ravnokar"
     read_more: "preberi več"
@@ -347,7 +346,6 @@ sl:
       remove: "Odstrani"
       remove_confirmation: "Ali ste prepričani da hočete izbrisati ta osnutek?"
       new_topic: "Nov osnutek teme"
-      new_private_message: "Nov osnutek zasebnega sporočila"
       topic_reply: "Osnutek odgovora"
       abandon:
         yes_value: "Zavrzi"
@@ -739,8 +737,6 @@ sl:
         public: "Javno"
         private: "Zasebno"
         public_groups: "Javne skupine"
-        automatic_group: Samodejna skupina
-        close_group: Zapri skupino
         my_groups: "Moje skupine"
         group_type: "Vrsta skupine"
         is_group_user: "Član"
@@ -819,6 +815,8 @@ sl:
       flair_type:
         icon: "Izberite ikono"
         image: "Naložite sliko"
+      default_notifications:
+        modal_yes: "Da"
     user_action_groups:
       "1": "Dani všečki"
       "2": "Prejeti všečki"
@@ -848,7 +846,6 @@ sl:
       posts: "Prispevki"
       topics: "Teme"
       latest: "Najnovejše"
-      toggle_ordering: "preklop nadzora razvrščanja"
       subcategories: "Pod Kategorija"
       muted: "Utišane kategorije"
       topic_sentence:
@@ -1289,7 +1286,6 @@ sl:
         browser_active: '%{browser} | <span class="active">aktiven zdaj</span>'
         browser_last_seen: "%{browser} | %{date}"
       last_posted: "Zadnji prispevek"
-      last_emailed: "Zadnja e-pošta"
       last_seen: "Viden"
       created: "Pridružen"
       log_out: "Odjava"
@@ -2175,13 +2171,6 @@ sl:
       defer:
         help: "Označi kot neprebrano"
         title: "Preloži"
-      feature_on_profile:
-        help: "Na svojo uporabniško kartico in profil dodajte povezavo do te teme"
-        title: "Izpostavi na profilu"
-      remove_from_profile:
-        warning: "Vaš profil že ima izpostavljeno temo. Če nadaljujete, bo ta tema nadomestila obstoječo temo."
-        help: "Odstrani povezavo do te teme z mojega uporabniškega profila"
-        title: "Odstrani s profila"
       list: "Teme"
       new: "nova tema"
       unread: "neprebrana"
@@ -2648,8 +2637,6 @@ sl:
       whisper: "ta prispevek je zasebno šepetanje med moderatorji"
       wiki:
         about: "ta prispevek je wiki"
-      archetypes:
-        save: "Shrani možnosti"
       few_likes_left: "Hvala ker delite všečke! Danes jih imate samo še nekaj na voljo."
       controls:
         reply: "sestavi odgovor na ta prispevek"
@@ -2770,6 +2757,7 @@ sl:
       bookmarks:
         created: "Ustvarjeno"
         name: "Polno ime"
+        options: "Možnosti"
       filtered_replies:
         viewing_posts_by: "Ogled %{post_count} objav avtorja"
         viewing_subset: "Nekateri odgovori so strnjeni"
@@ -2777,7 +2765,6 @@ sl:
         post_number: "%{username}, objava #%{post_number}"
         show_all: "Pokaži vse"
     category:
-      can: "lahko&hellip; "
       none: "(brez kategorije)"
       all: "Vse kategorije"
       choose: "kategorija&hellip;"
@@ -2804,7 +2791,6 @@ sl:
       save_error: Prišlo je do napake pri shranjevanju kategorije.
       name: "Ime kategorije"
       description: "Opis"
-      topic: "kategorija teme"
       logo: "Logotip slika kategorije"
       background_image: "Slika ozadja kategorije"
       badge_colors: "Barve značk"
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index 7aa10d5f50..7c7a9dd2aa 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -182,7 +182,6 @@ sq:
     tos: "Kushtet e shërbimit"
     mobile_view: "Pamja për celular"
     desktop_view: "Pamja për desktop"
-    you: "Ju"
     or: "ose"
     now: "tani"
     read_more: "lexo më shumë"
@@ -406,7 +405,6 @@ sq:
       index:
         title: "Grupet"
         automatic: "Automatik"
-        automatic_group: Grup automatik
         my_groups: "Grupet e mia"
         is_group_user: "Anëtar"
       title:
@@ -443,6 +441,8 @@ sq:
           title: "Pa njoftime"
       flair_preview_icon: "Parashiko ikonën"
       flair_preview_image: "Parashiko imazhin"
+      default_notifications:
+        modal_yes: "Po"
     user_action_groups:
       "1": "Pëlqime të dhëna"
       "2": "Pëlqime të marra"
@@ -472,7 +472,6 @@ sq:
       posts: "Postime"
       topics: "Tema"
       latest: "Të fundit"
-      toggle_ordering: "toggle ordering control"
       subcategories: "Nënkategori"
       topic_sentence:
         one: "%{count} temë"
@@ -706,7 +705,6 @@ sq:
       auth_tokens:
         details: "Detaje"
       last_posted: "Postimi i fundit"
-      last_emailed: "Emaili i Fundit"
       last_seen: "Parë"
       created: "Regjistruar"
       log_out: "Shkëputu"
@@ -1469,8 +1467,6 @@ sq:
       whisper: "ky postim është një pëshpëritje private për moderatorët"
       wiki:
         about: "kjo temë është wiki"
-      archetypes:
-        save: "Ruaj opsionet"
       few_likes_left: "Ju falenderojmë! Ju kanë ngelur edhe disa pëlqime për sot."
       controls:
         reply: "shkruaj një përgjigje tek ky diskutim"
@@ -1534,8 +1530,8 @@ sq:
       bookmarks:
         created: "Krijuar"
         name: "Emri"
+        options: "Opsione"
     category:
-      can: "mund&hellip; "
       none: "(pa kategori)"
       all: "Të gjitha kategoritë"
       edit: "Redakto"
@@ -1556,7 +1552,6 @@ sq:
       save_error: Pati një gabim gjatë ruajtjes së kategorisë
       name: "Emri i kategorisë"
       description: "Përshkrimi"
-      topic: "category topic"
       logo: "Logo e kategorisë"
       background_image: "Imazhi i sfondit për kategorinë"
       badge_colors: "Ngjyrat e stemës"
diff --git a/config/locales/client.sr.yml b/config/locales/client.sr.yml
index 18c7da1d2b..a343e07aa8 100644
--- a/config/locales/client.sr.yml
+++ b/config/locales/client.sr.yml
@@ -229,7 +229,6 @@ sr:
     conduct: "Kodeks ponašanja"
     mobile_view: "Mobilni pogled"
     desktop_view: "Računarski pogled"
-    you: "Ti"
     or: "ili"
     now: "upravo sad"
     read_more: "pročitaj više"
@@ -310,7 +309,6 @@ sr:
       remove: "Ukloni"
       remove_confirmation: "Da li ste sigurni da želite da uklonite ovaj nacrt?"
       new_topic: "Novi nacrt teme"
-      new_private_message: "Novi nacrt privatne poruke"
       topic_reply: "Nacrt odgovora"
       abandon:
         confirm: "Imate nacrt za ovu temu. Sta želite da učinite sa njim?"
@@ -566,6 +564,8 @@ sr:
           title: "Utišano"
       flair_bg_color_placeholder: "(Opciono) Hex vrednost boje"
       flair_color_placeholder: "(Opciono) Hex vrednost boje"
+      default_notifications:
+        modal_yes: "Da"
     user_action_groups:
       "1": "Data sviđanja"
       "2": "Dobijena sviđanja"
@@ -593,7 +593,6 @@ sr:
       posts: "Poruka"
       topics: "Teme"
       latest: "Poslednje"
-      toggle_ordering: "odredi kontrolu smera"
       subcategories: "Podkategorije"
       topic_stat_unit:
         week: "nedelja"
@@ -774,7 +773,6 @@ sr:
       auth_tokens:
         details: "Detalji"
       last_posted: "Poslednja poruka"
-      last_emailed: "Poslednji e-mail"
       last_seen: "Viđen"
       created: "Pridružio"
       log_out: "Odjavi se"
@@ -1391,8 +1389,6 @@ sr:
       cancel_composer:
         discard: "Odbaci"
       via_email: "ova poruka stigla je preko e-maila"
-      archetypes:
-        save: "Sačuvaj postavke"
       controls:
         reply: "počnite sa sastavljanjem odgovora na ovu poruku"
         like: "Lajkuj ovu poruku"
@@ -1441,8 +1437,8 @@ sr:
       bookmarks:
         created: "Napravljeno"
         name: "Ime foruma"
+        options: "Opcije"
     category:
-      can: "može&hellip"
       none: "(nema kategorije)"
       edit: "Izmeni"
       view: "Prikaži Teme u Kategoriji"
@@ -1457,7 +1453,6 @@ sr:
       save_error: Dogodila se greška pri čuvanju kategorije.
       name: "Ime Kategorije"
       description: "Opis"
-      topic: "tema kategorije"
       logo: "Logo Kategorije "
       background_image: "Pozadinska Slika Kategorije"
       badge_colors: "Boje značke"
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index c8bd49102a..bdd531149e 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -221,7 +221,6 @@ sv:
     conduct: "Uppförandekod"
     mobile_view: "Mobilvy"
     desktop_view: "Desktop-vy"
-    you: "Du"
     or: "eller"
     now: "nyss"
     read_more: "läs mer"
@@ -306,7 +305,7 @@ sv:
       remove: "Ta bort"
       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 privat meddelande"
+      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?"
@@ -380,7 +379,7 @@ sv:
         type_bonus:
           name: "typ bonus"
           title: "Vissa granskningsärenden kan tilldelas en bonus av personal för att ge dem en högre prioritet."
-      stale_help: "Denna granskningsbara har lösts av någon annan."
+      stale_help: "Detta granskningsbara objekt har lösts av <b>%{username}</b>."
       claim_help:
         optional: "Du kan göra anspråk på detta för att förhindra andra från att granska det."
         required: "Du måste göra anspråk innan du kan granska dem."
@@ -753,8 +752,6 @@ sv:
         public: "Publikt"
         private: "Privat"
         public_groups: "Offentliga grupper"
-        automatic_group: Automatisk grupp
-        close_group: Stäng grupp
         my_groups: "Mina grupper"
         group_type: "Grupptyper"
         is_group_user: "Medlem"
@@ -831,6 +828,11 @@ sv:
       flair_type:
         icon: "Välj en ikon"
         image: "Infoga bild"
+      default_notifications:
+        modal_title: "Användarens standardaviseringar"
+        modal_description: "Vill du tillämpa denna förändring historiskt? Detta kommer att ändra inställningarna för %{count} existerande användare."
+        modal_yes: "Ja"
+        modal_no: "Nej, tillämpa enbart ändringar fr.o.m. nu"
     user_action_groups:
       "1": "Gillningar givna"
       "2": "Gillningar mottagna"
@@ -860,7 +862,6 @@ sv:
       posts: "Inlägg"
       topics: "Ämnen"
       latest: "Senaste"
-      toggle_ordering: "slå av/på sorteringskontroll"
       subcategories: "Underkategorier"
       muted: "Tystade kategorier"
       topic_sentence:
@@ -1313,7 +1314,6 @@ sv:
         browser_active: '%{browser} | <span class="active">aktiv nu</span>'
         browser_last_seen: "%{browser} | %{date}"
       last_posted: "Senaste inlägg"
-      last_emailed: "Senast mailad"
       last_seen: "Sedd"
       created: "Gick med"
       log_out: "Logga ut"
@@ -1534,7 +1534,7 @@ sv:
         none: "(ingen)"
         instructions: "visas efter ditt användarnamn"
       flair:
-        title: "Flair"
+        title: "Stil"
         none: "(ingen)"
         instructions: "ikon som visas bredvid din profilbild"
       primary_group:
@@ -1961,7 +1961,7 @@ sv:
           confirm: Du har ett nytt ämnesutkast sparat, vilket kommer att skrivas över om du skapar ett länkat ämne.
         reply_as_new_group_message:
           label: Svara som nytt gruppmeddelande
-          desc: Skapa ett nytt privat meddelande till samma mottagare
+          desc: Skapa nytt meddelande som börjar med samma mottagare
         reply_as_private_message:
           label: Nytt meddelande
           desc: Skapa ett nytt personligt meddelande
@@ -2256,13 +2256,6 @@ sv:
       defer:
         help: "Märk som oläst"
         title: "Skjut upp"
-      feature_on_profile:
-        help: "Lägg till en länk till detta ämne från ditt användarkort samt profil"
-        title: "Föredraget från profil"
-      remove_from_profile:
-        warning: "Din profil har redan ett föredraget ämne. Om du fortsätter kommer detta ämne att ersätta ditt tidigare ämne."
-        help: "Ta bort länken till detta ämne från din användarprofil"
-        title: "Ta bort från profil"
       list: "Ämnen"
       new: "nytt ämne"
       unread: "oläst"
@@ -2488,7 +2481,7 @@ sv:
         pin: "Fäst ämne"
         unpin: "Ta ner ämne"
         pin_globally: "Fäst ämne globalt"
-        make_banner: "Gör banderollämne"
+        make_banner: "Skapa banderollämne"
         remove_banner: "Ta bort banderollämne"
       reply:
         title: "Svara"
@@ -2742,8 +2735,6 @@ sv:
       whisper: "det här inlägget är en privat viskning för moderatorer"
       wiki:
         about: "detta inlägg är en wiki"
-      archetypes:
-        save: "Spara inställningar"
       few_likes_left: "Tack för att du sprider kärleken! Du har bara några få gillningar kvar idag."
       controls:
         reply: "börja skriva ett svar på detta inlägg"
@@ -2865,6 +2856,7 @@ sv:
         name: "Namn"
         name_placeholder: "Vad används detta bokmärke till?"
         set_reminder: "Påminn mig"
+        options: "Alternativ"
         actions:
           delete_bookmark:
             name: "Radera bokmärke"
@@ -2885,7 +2877,6 @@ sv:
         post_number: "%{username}, inlägg nr %{post_number}"
         show_all: "Visa alla"
     category:
-      can: "can&hellip; "
       none: "(ingen kategori)"
       all: "Alla kategorier"
       choose: "kategori&hellip;"
@@ -2919,7 +2910,6 @@ sv:
       save_error: Ett fel inträffade då kategorin skulle sparas.
       name: "Kategorinamn"
       description: "Beskrivning"
-      topic: "kategoriämne"
       logo: "Kategori logotypbild"
       background_image: "Kategori bakgrundsbild"
       badge_colors: "Utmärkelsefärg"
@@ -3498,6 +3488,8 @@ sv:
         regular: "regelbunden"
         leader: "ledare"
       detailed_name: "%{level}: %{name}"
+    pick_files_button:
+      unsupported_file_picked: "Du har valt en fil som inte stöds. Filtyper som stöds: %{types}."
   admin_js:
     type_to_filter: "skriv för att filtrera..."
     admin:
@@ -3728,6 +3720,7 @@ sv:
               log_out: Logga ut alla sessioner för en användare.
               anonymize: Anonymisera användarkonton.
               delete: Ta bort användarkonton.
+              list: Få en lista över användare.
             email:
               receive_emails: Kombinera detta omfång med e-postmottagaren för att bearbeta inkommande e-post.
       web_hooks:
@@ -3942,6 +3935,7 @@ sv:
           theme: "Tema"
           component: "Komponent"
           components: "Komponenter"
+          filter_placeholder: "skriv för att filtrera…"
           theme_name: "Temanamn"
           component_name: "Komponentnamn"
           themes_intro: "Välj ett befintligt tema eller installera ett nytt för att komma igång"
@@ -4930,8 +4924,11 @@ sv:
           perform: "Tilldela utmärkelse till användare"
           upload_csv: Ladda upp en CSV med antingen användares e-postadress eller användarnamn
           aborted: Ladda upp en CSV som innehåller antingen användares e-postadress eller användarnamn
-          success: Din CSV mottogs och användare kommer att få sin utmärkelse inom kort.
+          success: Din CSV togs emot och %{count} användare kommer att få sin utmärkelse inom kort.
+          csv_has_unmatched_users: "Följande poster finns i CSV-filen, men matchade inte befintliga användare, och kommer därför inte att få utmärkelsen:"
+          csv_has_unmatched_users_truncated_list: "Det fanns %{count} poster i CSV-filen som inte matchade befintliga användare och därför inte får utmärkelsen. På grund av det stora antalet omatchade poster visas bara de första 100:"
           replace_owners: Ta bort utmärkelsen från tidigare mottagare
+          grant_existing_holders: Utfärda ytterligare utmärkelser till befintliga utmärkelseinnehavare
       emoji:
         title: "Emoji"
         help: "Lägg till en ny emoji för andra att använda. (TIPS: dra och släpp flera filer på en och samma gång)"
diff --git a/config/locales/client.sw.yml b/config/locales/client.sw.yml
index 0fe74b35f8..36f0062cc5 100644
--- a/config/locales/client.sw.yml
+++ b/config/locales/client.sw.yml
@@ -188,7 +188,6 @@ sw:
     tos: "Masharti ya Huduma"
     mobile_view: "Mtazamo wa Simu"
     desktop_view: "Muonekano wa Eneo Kazi"
-    you: "Wewe"
     or: "au"
     now: "sasa hivi"
     read_more: "soma zaidi"
@@ -238,7 +237,6 @@ sw:
     drafts:
       remove: "Ondoa"
       new_topic: "Mswadajaribio wa mada mpya"
-      new_private_message: "Mswadajaribio wa ujumbe binafsi mpya"
     topic_count_latest:
       one: "Angalia Topiki Mpya au Masahisho %{count}"
       other: "Angalia Topiki Mpya au Masahisho %{count}"
@@ -466,8 +464,6 @@ sw:
         public: "Umma"
         private: "Binafsi"
         public_groups: "Vikundi vya Umma"
-        automatic_group: Kikundi Otomatiki
-        close_group: Funga Kikundi
         my_groups: "Vikundi Vyangu"
         group_type: "Aina ya kikundi"
         is_group_user: "Mwanachama"
@@ -521,6 +517,8 @@ sw:
       flair_color_placeholder: "(Hiari) Thamani ya Rangi kwa Hex"
       flair_preview_icon: "Kihakiki Ikoni"
       flair_preview_image: "Kihakiki Picha"
+      default_notifications:
+        modal_yes: "Ndiyo"
     user_action_groups:
       "1": "Upendo Uliotolewa"
       "2": "Upendo Uliopokea"
@@ -550,7 +548,6 @@ sw:
       posts: "Machapisho"
       topics: "Mada"
       latest: "Hivi Karibuni"
-      toggle_ordering: "swichi udhibiti wa oda"
       subcategories: "Kategoria mtoto"
       topic_sentence:
         one: "%{count} topiki"
@@ -819,7 +816,6 @@ sw:
       auth_tokens:
         details: "Taarifa"
       last_posted: "chapisho la mwisho"
-      last_emailed: "Mara ya Mwisho Amepokea Barua Pepe"
       last_seen: "Imeonwa"
       created: "Amejiunga"
       log_out: "Ondoka"
@@ -1797,8 +1793,6 @@ sw:
       whisper: "Chapisho hili ni binafsi kwa wasimamizi tu."
       wiki:
         about: "chapisho hili ni wiki"
-      archetypes:
-        save: "Hifadhi Machaguo"
       few_likes_left: "Asante kwa kutoa upendo! Umebakiwa na upendo mchache kwa ajili ya leo."
       controls:
         reply: "anza kuandika jibu kwenye mada hii"
@@ -1878,8 +1872,8 @@ sw:
       bookmarks:
         created: "Imetengenezwa"
         name: "Jina"
+        options: "Chaguo"
     category:
-      can: "can&hellip; "
       none: "(hakuna kategoria)"
       all: "Kategoria Zote"
       edit: "Hariri"
@@ -1899,7 +1893,6 @@ sw:
       save_error: Hitilafu imetokea wakati wa kuhifadhi kategoria.
       name: "Jina la Kategoria"
       description: "Maelezo"
-      topic: "kategoria mada"
       logo: "Nembo ya Kategoria"
       background_image: "Mandharinyuma ya Kategoria"
       badge_colors: "Rangi za Beji"
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index a7fc5a4ff5..39aa680b3e 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -127,7 +127,6 @@ te:
     tos: "సేవా నిబంధనలు"
     mobile_view: "చర సందర్శనం"
     desktop_view: "డెస్క్ టాప్ సందర్శనం"
-    you: "మీరు"
     or: "లేదా"
     now: "ఇప్పుడే"
     read_more: "మరింత చదువు"
@@ -330,6 +329,8 @@ te:
           title: "గమనిస్తున్నారు"
         muted:
           title: "నిశ్శబ్దం"
+      default_notifications:
+        modal_yes: "అవును"
     user_action_groups:
       "1": "ఇచ్చిన ఇష్టాలు "
       "2": "వచ్చిన ఇష్టాలు"
@@ -354,7 +355,6 @@ te:
       posts: "టపాలు"
       topics: "విషయాలు"
       latest: "తాజా"
-      toggle_ordering: "వరుస నియంత్రణను అటుఇటుచేయి"
       subcategories: "ఉప వర్గాలు"
       topic_stat_unit:
         week: "వారం"
@@ -526,7 +526,6 @@ te:
       auth_tokens:
         details: "వివరాలు"
       last_posted: "చివరి టపా"
-      last_emailed: "చివరగా ఈమెయిల్ చేసింది"
       last_seen: "చూసినది"
       created: "చేరినది"
       log_out: "లాగవుట్"
@@ -1022,8 +1021,6 @@ te:
         attachment_upload_not_allowed_for_new_user: "క్షమించాలి. కొత్త సభ్యులు జోడింపులు ఎగుమతి చేయలేరు."
         attachment_download_requires_login: "క్షమించాలి. జోడింపులు దిగుమతి చేసుకోవడానికి మీరు లాగిన్ అయి ఉండాలి."
       via_email: "ఈ టపా ఈమెయిల్ ద్వారా వచ్చింది"
-      archetypes:
-        save: "భద్రపరుచు ఐచ్చికాలు"
       controls:
         reply: "ఈ టపాకు జవాబు రాయుట మొదలుపెట్టండి"
         like: "ఈ టపాను ఇష్టపడు"
@@ -1076,8 +1073,8 @@ te:
       bookmarks:
         created: "సృష్టించిన"
         name: "పేరు"
+        options: "ఎంపికలు"
     category:
-      can: "can&hellip;"
       none: "(ఏ వర్గం లేదు)"
       edit: "సవరించు"
       view: "ఈ వర్గంలోని విషయాలు చూడు"
@@ -1093,7 +1090,6 @@ te:
       save_error: ఈ వర్గం భద్రపరిచేప్పుడు దోషం
       name: "వర్గం పేరు"
       description: "వివరణ"
-      topic: "వర్గం విషయం"
       logo: "వర్గం లోగో బొమ్మ"
       background_image: "వర్గం వెనుతలపు బొమ్మ"
       badge_colors: "బ్యాడ్జి రంగులు"
diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml
index 4f6eb21f1e..90a512acca 100644
--- a/config/locales/client.th.yml
+++ b/config/locales/client.th.yml
@@ -182,7 +182,6 @@ th:
     conduct: "กฎเกณฑ์และเงื่อนไข"
     mobile_view: "ดูแบบอุปกรณ์เคลื่อนที่"
     desktop_view: "ดูแบบเดสก์ท็อป"
-    you: "คุณ"
     or: "หรือ"
     now: "ขณะนี้"
     read_more: "อ่านเพิ่มเติม"
@@ -250,7 +249,6 @@ th:
       resume: "ดำเนินการต่อ"
       remove: "ลบ"
       new_topic: "แบบร่างกระทู้ใหม่"
-      new_private_message: "แบบร่างข้อความส่วนตัวใหม่"
       topic_reply: "ตอบแบบร่าง"
     topic_count_latest:
       other: "ดู %{count} กระทู้ใหม่หรือที่อัปเดต"
@@ -539,8 +537,6 @@ th:
         public: "สาธารณะ"
         private: "ส่วนตัว"
         public_groups: "กลุ่มสาธารณะ"
-        automatic_group: กลุ่มอัตโนมัติ
-        close_group: กลุ่มปิด
         my_groups: "กลุ่มของฉัน"
         group_type: "ประเภทกลุ่ม"
         is_group_user: "สมาชิก"
@@ -595,6 +591,8 @@ th:
       flair_type:
         icon: "เลือกไอคอน"
         image: "อัปโหลดรูปภาพ"
+      default_notifications:
+        modal_yes: "ใช่"
     user_action_groups:
       "1": "ถูกใจ"
       "2": "ถูกใจ"
@@ -624,7 +622,6 @@ th:
       posts: "โพสต์"
       topics: "กระทู้"
       latest: "ล่าสุด"
-      toggle_ordering: "เปลี่ยนวิธีการจัดลำดับ"
       subcategories: "หมวดหมู่ย่อย"
       topic_sentence:
         other: "%{count}กระทู้"
@@ -930,7 +927,6 @@ th:
         secure_account: "ตั้งค่าความปลอดภัยบัญชีของฉัน"
         latest_post: "คุณโพสต์ครั้งล่าสุด..."
       last_posted: "โพสต์ล่าสุด"
-      last_emailed: "อีเมลล่าสุด"
       last_seen: "ดูแล้ว"
       created: "เข้าร่วมแล้ว"
       log_out: "ออกจากระบบ"
@@ -1623,8 +1619,6 @@ th:
         title: "แก้ไข"
       defer:
         help: "ทำเครื่องหมายว่ายังไม่ได้อ่าน"
-      remove_from_profile:
-        title: "ลบออกจากโปรไฟล์"
       list: "กระทู้"
       new: "กระทู้ใหม่"
       unread: "ยังไม่ได้อ่าน"
@@ -1955,8 +1949,6 @@ th:
       whisper: "โพสนี้คือการกระซิบจากผู้ดูแล"
       wiki:
         about: "โพสนี้เป็นวิกิ; ผู้ใช้ธรรมดาสามารถแก้ไขได้"
-      archetypes:
-        save: "บันทึกการตั้งค่า"
       few_likes_left: "ขอบคุณสำหรับการแบ่งปันความรัก! คุณเหลือเพียงไม่กี่ไลค์สำหรับวันนี้"
       controls:
         reply: "เริ่มเขียนคำตอบโพสต์นี้"
@@ -2027,6 +2019,7 @@ th:
         name: "ชื่อ"
         name_placeholder: "บุ๊กมาร์กนี้สำหรับสิ่งใด"
         set_reminder: "เตือนฉัน"
+        options: "ตัวเลือก"
         actions:
           delete_bookmark:
             name: "ลบบุ๊กมาร์ก"
@@ -2051,7 +2044,6 @@ th:
       save_error: มีข้อผิดพลาดในการบันทึกหมวดหมู่
       name: "ชื่อหมวดหมู่"
       description: "รายละเอียด"
-      topic: "กระทู้หมวดหมู่"
       logo: "รูปโลโก้หมวดหมู่"
       background_image: "รูปพื้นหลังหมวดหมู่"
       background_color: "สีพื้นหลัง"
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 2c073c9c67..6cf4e9660a 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -41,6 +41,7 @@ tr_TR:
       long_date_without_year_with_linebreak: "D MMM <br/>LT"
       long_date_with_year_with_linebreak: "D MMM 'YY <br/>LT"
       wrap_ago: "%{date} önce"
+      wrap_on: "%{date} tarihinde"
       tiny:
         half_a_minute: "< 1d"
         less_than_x_seconds:
@@ -220,7 +221,6 @@ tr_TR:
     conduct: "Davranış kodu"
     mobile_view: "Mobil Görünüm"
     desktop_view: "Masaüstü Görünümü"
-    you: "Siz"
     or: "ya da"
     now: "hemen şimdi"
     read_more: "devamını oku"
@@ -305,7 +305,7 @@ tr_TR:
       remove: "Kaldır"
       remove_confirmation: "Bu taslağı silmek istediğinizden emin misiniz?"
       new_topic: "Yeni konu taslağı"
-      new_private_message: "Yeni özel mesaj taslağı"
+      new_private_message: "Yeni kişisel mesaj taslağı"
       topic_reply: "Cevap taslağı"
       abandon:
         confirm: "Bu konu için devam eden bir taslağınız var. Bununla ne yapmak istersiniz?"
@@ -379,7 +379,6 @@ tr_TR:
         type_bonus:
           name: "tür bonusu"
           title: "Bazı gözden geçirilebilir türlere daha yüksek öncelikli olmaları için personel tarafından bir bonus tahsis edilebilir."
-      stale_help: "Bu gözden geçirme bir başkası tarafından çözüldü."
       claim_help:
         optional: "Başkalarının incelemesini engellemek için bu öğeyi talep edebilirsiniz."
         required: "Öğeleri inceleyebilmeniz için önce hak talebinde bulunmalısınız."
@@ -752,8 +751,6 @@ tr_TR:
         public: "Herkese Açık"
         private: "Özel"
         public_groups: "Açık Gruplar"
-        automatic_group: Otomatik Grup
-        close_group: Kapalı grup
         my_groups: "Gruplarım"
         group_type: "Grup türü"
         is_group_user: "Üye"
@@ -830,6 +827,11 @@ tr_TR:
       flair_type:
         icon: "Bir simge seçin"
         image: "Bir görüntü yükle"
+      default_notifications:
+        modal_title: "Kullanıcı varsayılan bildirimleri"
+        modal_description: "Bu değişikliği tarihsel olarak uygulamak ister misiniz? Bu, %{count}mevcut kullanıcı için tercihlerini ​​değiştirecek."
+        modal_yes: "Evet"
+        modal_no: "Hayır, yalnızca ileriye dönük değişiklikleri uygulayın"
     user_action_groups:
       "1": "Beğenilenler"
       "2": "Alınan Beğeniler"
@@ -859,7 +861,6 @@ tr_TR:
       posts: "Gönderiler"
       topics: "Konular"
       latest: "En Son"
-      toggle_ordering: "talep kontrolünü değiştir"
       subcategories: "Alt kategoriler"
       muted: "Yok sayılan kategoriler"
       topic_sentence:
@@ -1310,7 +1311,6 @@ tr_TR:
         browser_active: '%{browser} | <span class="active">şu anda aktif</span>'
         browser_last_seen: "%{browser} | %{date}"
       last_posted: "Son Gönderi"
-      last_emailed: "Gönderilen Son E-posta"
       last_seen: "Görüldü"
       created: "Katıldı"
       log_out: "Oturumu Kapat"
@@ -1958,7 +1958,7 @@ tr_TR:
           confirm: Bağlantılı bir konu oluşturduğunuzda üzerine yazılacak yeni bir konu taslağınız var.
         reply_as_new_group_message:
           label: Yeni grup mesajı olarak yanıtla
-          desc: Aynı alıcılarla yeni bir özel mesaj oluşturun
+          desc: Aynı alıcılarla başlayan yeni mesaj oluştur
         reply_as_private_message:
           label: Yeni Mesaj
           desc: Kişisel bir mesaj oluştur
@@ -2253,13 +2253,6 @@ tr_TR:
       defer:
         help: "okunmamış olarak işaretle"
         title: "Ertele"
-      feature_on_profile:
-        help: "Kullanıcı kartı ve profiliniz üzerinden bu konuya bir bağlantı ekleyin"
-        title: "Profil Özelliği"
-      remove_from_profile:
-        warning: "Profilinizde zaten öne çıkan bir konu var. Devam ederseniz, bu konu mevcut konunun yerine öne çıkacaktır."
-        help: "Kullanıcı profilinizdeki bu konunun bağlantısını kaldırın"
-        title: "Profilden Kaldır"
       list: "Konular"
       new: "yeni konu"
       unread: "okunmamış"
@@ -2739,8 +2732,6 @@ tr_TR:
       whisper: "bu gönderi yöneticiler için özel bir fısıltıdır"
       wiki:
         about: "bu gönderi bir wiki'dir"
-      archetypes:
-        save: "Seçenekleri kaydet"
       few_likes_left: "Beğendiğin için teşekkürler! Bugün için sadece birkaç beğenin kaldı. "
       controls:
         reply: "bu gönderiye bir cevap oluşturmaya başla"
@@ -2862,6 +2853,7 @@ tr_TR:
         name: "İsim"
         name_placeholder: "Bu yer imi ne için?"
         set_reminder: "Bana hatırlat"
+        options: "Seçenekler"
         actions:
           delete_bookmark:
             name: "Yer işaretini sil"
@@ -2882,7 +2874,6 @@ tr_TR:
         post_number: "%{username}, post #%{post_number}"
         show_all: "Hepsini Göster ↓"
     category:
-      can: "yapabilir&hellip;"
       none: "(kategori yok)"
       all: "Tüm kategoriler"
       choose: "kategori&yardım;"
@@ -2916,7 +2907,6 @@ tr_TR:
       save_error: Kategori kaydedilirken hata oluştu.
       name: "Kategori Adı"
       description: "Açıklama"
-      topic: "kategori konusu"
       logo: "Kategori Logo Resmi"
       background_image: "Kategori Arka Plan Resmi "
       badge_colors: "Rozet renkleri"
@@ -3724,6 +3714,7 @@ tr_TR:
               log_out: Bir kullanıcı için tüm oturumları kapatın.
               anonymize: Kullanıcı hesaplarını anonimleştir.
               delete: Kullanıcı hesaplarını sil.
+              list: Kullanıcıların listesini alın.
             email:
               receive_emails: Gelen e-postaları işlemek için bu kapsamı posta alıcısıyla birleştirin.
       web_hooks:
@@ -3938,6 +3929,7 @@ tr_TR:
           theme: "Tema"
           component: "Bileşen"
           components: "Bileşenler"
+          filter_placeholder: "…filtrelemek için yazın"
           theme_name: "Tema adı"
           component_name: "Bileşen Adı"
           themes_intro: "Başlamak için mevcut bir tema seçin veya yeni bir tema\n yükleyin"
@@ -4926,8 +4918,11 @@ tr_TR:
           perform: "Kullanıcılara Ödül Rozeti"
           upload_csv: Kullanıcı e-postalarını veya kullanıcı adlarını içeren bir CSV yükleyin
           aborted: Lütfen kullanıcı e-postalarını veya kullanıcı adlarını içeren bir CSV dosyası yükleyin
-          success: 'CSV&#39;niz alındı ve kullanıcılar kısa süre içinde rozetlerini alacaklar.'
+          success: CSV'niz alındı ve %{count} adet kullanıcı kısa süre içinde rozetlerini alacak.
+          csv_has_unmatched_users: "Aşağıdakiler CSV dosyasında var ama mevcut kullanıcılarla eşleştirilemedi ve bu nedenle rozeti almayacaklar:"
+          csv_has_unmatched_users_truncated_list: "CSV dosyasında mevcut kullanıcılarla eşleştirilemeyen %{count} girdi var ve bu nedenle rozeti almıyor. Eşleştirilemeyen girişlerin sayısı çok olduğundan, yalnızca ilk 100 tanesi gösteriliyor:"
           replace_owners: Rozeti önceki sahiplerden kaldır
+          grant_existing_holders: Mevcut rozet sahiplerine ek rozetler ver
       emoji:
         title: "Emoji"
         help: "Herkese açık yeni bir emoji ekle. (PROTIP: birden çok dosyayı tek seferde sürükleyip bırakabilirsin)"
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index 016c3ff6b0..ef945a9df1 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -268,7 +268,6 @@ uk:
     conduct: "Кодекс поведінки"
     mobile_view: "Мобільний вигляд"
     desktop_view: "Стаціонарний вигляд"
-    you: "Ви"
     or: "або"
     now: "щойно"
     read_more: "читати більше"
@@ -354,7 +353,6 @@ uk:
       remove: "Вилучити"
       remove_confirmation: "Ви дійсно бажаєте видалити цю чернетку?"
       new_topic: "Нова чернетка теми"
-      new_private_message: "Нова чернетка приватного повідомлення"
       topic_reply: "Чернетка відповіді"
       abandon:
         confirm: "У вас є чернетка для цієї теми. Що б ви хотіли з цим зробити?"
@@ -807,8 +805,6 @@ uk:
         public: "Публічні"
         private: "Приватні"
         public_groups: "Публічні групи"
-        automatic_group: Автоматична група
-        close_group: Закрита група
         my_groups: "Мої групи"
         group_type: "Тип групи"
         is_group_user: "Учасник"
@@ -887,6 +883,10 @@ uk:
       flair_type:
         icon: "Виберіть піктограму"
         image: "Завантажити зображення"
+      default_notifications:
+        modal_description: "Хотіли б ви застосувати цю зміну історично? Це змінить налаштування для %{count} існуючих користувачів."
+        modal_yes: "Так"
+        modal_no: "Ні, тільки застосувати зміни в майбутньому"
     user_action_groups:
       "1": "Вподобані"
       "2": "Отримані вподобання"
@@ -916,7 +916,6 @@ uk:
       posts: "Повідомлення"
       topics: "Теми"
       latest: "Останні"
-      toggle_ordering: "показати/сховати елемент керування для впорядкування"
       subcategories: "Підкатегорії"
       muted: "Приглушені категорії"
       topic_sentence:
@@ -1376,7 +1375,6 @@ uk:
         browser_active: '%{browser} | <span class="active">active now</span>'
         browser_last_seen: "%{browser} | %{date}"
       last_posted: "Останній допис"
-      last_emailed: "Останній електронний лист"
       last_seen: "Помічено востаннє"
       created: "Приєднався(лась)"
       log_out: "Вийти"
@@ -2057,7 +2055,6 @@ uk:
           confirm: У вас збережений нова чернетка теми, яка буде перезаписана, якщо ви створите пов’язану тему.
         reply_as_new_group_message:
           label: Відповісти як нове повідомлення групи
-          desc: Створіть нове приватне повідомлення з тими ж одержувачами
         reply_as_private_message:
           label: Сворити нове
           desc: Створити нове приватне повідомлення
@@ -2381,13 +2378,6 @@ uk:
       defer:
         help: "Позначити як непрочитане"
         title: "Відкласти"
-      feature_on_profile:
-        help: "Додайте посилання на цю тему на своїй картці та профілі користувача"
-        title: "Вибрано у профілі"
-      remove_from_profile:
-        warning: "У вашому профілі вже є обрана тема. Якщо ви продовжите, ця тема замінить існуючу тему."
-        help: "Видаліть посилання на цю тему у своєму профілі користувача"
-        title: "Видалити з профілю"
       list: "Теми"
       new: "нова тема"
       unread: "непрочитані"
@@ -2908,8 +2898,6 @@ uk:
       whisper: "Це внутрішнє повідомлення, тобто воно видно тільки модераторам"
       wiki:
         about: "це вікі-повідомлення"
-      archetypes:
-        save: "Зберегти налаштування"
       few_likes_left: "Дякуємо, що ділитеся любов’ю. На сьогодні у Вас залишилося кілька лайків."
       controls:
         reply: "почати складати відповідь на цей допис"
@@ -3049,6 +3037,7 @@ uk:
         name: "Назва"
         name_placeholder: "Для чого ця закладка?"
         set_reminder: "Нагадати мені"
+        options: "Налаштування"
         actions:
           delete_bookmark:
             name: "Видалити закладку"
@@ -3069,7 +3058,6 @@ uk:
         post_number: "%{username}, повідомлення #%{post_number}"
         show_all: "Показати всі"
     category:
-      can: "може&hellip; "
       none: "(без категорії)"
       all: "Всі категорії"
       choose: "категорії &hellip;"
@@ -3103,7 +3091,6 @@ uk:
       save_error: Під час збереження категорії трапилася помилка.
       name: "Назва категорії"
       description: "Опис"
-      topic: "тема категорії"
       logo: "Логотип розділу"
       background_image: "Фонове зображення розділу"
       badge_colors: "Кольори значка"
@@ -5147,7 +5134,6 @@ uk:
           perform: "Відзнаки користувачам"
           upload_csv: Завантажити CSV з ел. поштою користувача чи іменами
           aborted: Будь ласка, завантажте CSV, що містить електронні листи користувачів або імена користувачів
-          success: Ваш CSV отримано, і користувачі незабаром отримають свій бейдж.
           replace_owners: Видаліть відзнаку в попередніх власників
       emoji:
         title: "Іконки"
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index 8c80d85113..fc7ff41254 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -214,7 +214,6 @@ ur:
     conduct: "ضابطہ اخلاق"
     mobile_view: "موبائل وِیو"
     desktop_view: "ڈیسک ٹاپ وِیو"
-    you: "آپ "
     or: "یا "
     now: "ابھی "
     read_more: "مزید پڑھیں "
@@ -296,7 +295,6 @@ ur:
       remove: "خارج کریں"
       remove_confirmation: "کیا آپ واقعی یہ مسودہ حذف کرنا چاہتے ہیں؟"
       new_topic: "نئے ٹاپک کا ڈرافٹ"
-      new_private_message: "نئے ذاتی پیغام کا ڈرافٹ"
       topic_reply: "جواب ڈرافٹ کریں"
       abandon:
         confirm: "آپ کے پاس اس عنوان کے لئے ایک مسودہ ہے۔ آپ اس کے ساتھ کیا کرنا چاہیں گے؟"
@@ -370,7 +368,6 @@ ur:
         type_bonus:
           name: "قِسم بَونَس"
           title: "سٹاف کی طرف سے کچھ قابل تجدید اقسام کو بَونَس تفویض کیا جاسکتا ہے تاکہ ان کو اعلیٰ ترجیح بنایا جاسکے۔"
-      stale_help: "یہ جائزہ کسی اور کی طرف سے حل کیا گیا ہے."
       claim_help:
         optional: "آپ اس چیز کو کََلیم کرسکتے ہیں کہ دوسروں کو اِسکا جائزہ لینے سے روکا جا سکے۔"
         required: "اشیاء کا جائزہ لینے سے پہلے آپ کا اُن کو کََلیم کرنا ضروری ہے۔"
@@ -691,8 +688,6 @@ ur:
         public: "عوامی"
         private: "ذاتی"
         public_groups: "عوامی گروپس"
-        automatic_group: خودکار گروپ
-        close_group: گروپ بند کریں
         my_groups: "میرے گروپس"
         group_type: "گروپ قِسم"
         is_group_user: "ممبر"
@@ -769,6 +764,8 @@ ur:
       flair_type:
         icon: "ایک آئکن منتخب کریں"
         image: "تصویر اپ لوڈ کریں"
+      default_notifications:
+        modal_yes: "ہاں "
     user_action_groups:
       "1": "لائیکس دیے گئے"
       "2": "لائیکس موصول ہوے"
@@ -798,7 +795,6 @@ ur:
       posts: "پوسٹ"
       topics: "ٹاپک"
       latest: "تازہ ترین"
-      toggle_ordering: "ترتیب کاری کا کنٹرول ٹاگل کریں"
       subcategories: "ذیلی زمرے"
       muted: "خاموش کیٹگریز"
       topic_sentence:
@@ -1192,7 +1188,6 @@ ur:
         browser_active: '%{browser} | <span class="active">اب فعال ہے</span>'
         browser_last_seen: "%{browser} | %{date}"
       last_posted: "آخری پوسٹ"
-      last_emailed: "جِسے آخری دفع اِی میل کی گئی"
       last_seen: "دیکھا ہوا"
       created: "شمولیت اختیار کی"
       log_out: "لاگ آُوٹ"
@@ -1758,7 +1753,6 @@ ur:
           confirm: آپ کے پاس ایک نیا عنوان ڈرافٹ محفوظ ہوا ہے ، اگر آپ کوئی لنکڈ ٹاپک تیار کرتے ہیں تو اسے اوور رائٹ کردیا جائے گا۔
         reply_as_new_group_message:
           label: نئے گروپ پیغام کے بطور جواب دیں
-          desc: انہی وصول کنندگان کے ساتھ ایک نیا نجی پیغام بنائیں
         reply_as_private_message:
           label: نیا پیغام
           desc: نیا ذاتی پیغام بنائیں
@@ -2450,8 +2444,6 @@ ur:
       whisper: "یہ پوسٹ ماڈریٹرز کے لئے ایک نجی وِھسپر ہے"
       wiki:
         about: "یہ پوسٹ ایک وِیکی ہے"
-      archetypes:
-        save: "محفوظ کرنے کے اختیارات"
       few_likes_left: "محبت شیئر کرنے کے لئے شکریہ! آپ کے پاس آج کے لئے صرف چند لائیکس بچے ہیں۔"
       controls:
         reply: "اس پوسٹ کا جواب لکھنا شروع کریں"
@@ -2552,8 +2544,8 @@ ur:
       bookmarks:
         created: "بنایا گیا"
         name: "نام"
+        options: "اختیارات"
     category:
-      can: "کر سکتا ہے&hellip; "
       none: "(کوئی زمرہ نہیں)"
       all: "تمام زُمرَہ جات"
       choose: "زمرہ&hellip;"
@@ -2580,7 +2572,6 @@ ur:
       save_error: زمرہ محفوظ کرنے میں ایک خرابی کا سامنا کرنا پڑا۔
       name: "زمرہ کا نام"
       description: "تفصیل"
-      topic: "زمرہ کا ٹاپک"
       logo: "زمرہ کے لوگو تصویر"
       background_image: "زمرہ کے پسِ منظر کی تصویر"
       badge_colors: "بَیج رنگ"
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index 63559fd3e6..337af43f40 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -193,7 +193,6 @@ vi:
     conduct: "Quy tắc ứng xử"
     mobile_view: "Xem ở chế độ di động"
     desktop_view: "Xem ở chế độ máy tính"
-    you: "Bạn"
     or: "hoặc"
     now: "ngay lúc này"
     read_more: "đọc thêm"
@@ -270,7 +269,6 @@ vi:
       remove: "Xoá"
       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: "Tin nhắn nháp mới"
       topic_reply: "Trả lời nháp"
       abandon:
         yes_value: "Hủy bỏ"
@@ -655,8 +653,6 @@ vi:
         public: "Công khai"
         private: "Riêng tư"
         public_groups: "Nhóm công khai"
-        automatic_group: Nhóm tự động
-        close_group: Nhóm riêng tư
         my_groups: "Nhóm của tôi"
         group_type: "Loại nhóm"
         is_group_user: "Thành viên"
@@ -717,6 +713,10 @@ vi:
       flair_type:
         icon: "Chọn một biểu tượng"
         image: "Tải lên một hình ảnh"
+      default_notifications:
+        modal_description: "Bạn có muốn áp dụng thay đổi này trong lịch sử không? Điều này sẽ thay đổi tùy chọn cho %{count} người dùng hiện tại."
+        modal_yes: "Có"
+        modal_no: "Không, chỉ áp dụng thay đổi về sau"
     user_action_groups:
       "1": "Lượt thích"
       "2": "Lần được thích"
@@ -746,7 +746,6 @@ vi:
       posts: "Bài viết"
       topics: "Chủ đề"
       latest: "Mới nhất"
-      toggle_ordering: "chuyển lệnh kiểm soát"
       subcategories: "Phân loại phụ"
       muted: "Các danh mục bị ẩn"
       topic_sentence:
@@ -1161,7 +1160,6 @@ vi:
         browser_active: '%{browser} | <span class="active">kích hoạt</span>'
         browser_last_seen: "%{browser} | %{date}"
       last_posted: "Bài viết cuối cùng"
-      last_emailed: "Đã email lần cuối"
       last_seen: "được thấy"
       created: "Đã tham gia"
       log_out: "Log Out"
@@ -1732,7 +1730,6 @@ vi:
           confirm: Bạn đã lưu một bản nháp chủ đề mới, bản nháp này sẽ bị ghi đè nếu bạn tạo một chủ đề được liên kết.
         reply_as_new_group_message:
           label: Trả lời dưới dạng tin nhắn nhóm mới
-          desc: Tạo một tin nhắn riêng mới với cùng những người nhận
         reply_as_private_message:
           label: Tin nhắn mới
           desc: Tạo một tin nhắn cá nhân mới
@@ -1999,13 +1996,6 @@ vi:
       defer:
         help: "đánh dấu là chưa đọc"
         title: "Hoãn"
-      feature_on_profile:
-        help: "Thêm liên kết đến chủ đề này trên thẻ người dùng và hồ sơ của bạn"
-        title: "Tính năng trên hồ sơ"
-      remove_from_profile:
-        warning: "Hồ sơ của bạn đã có một chủ đề nổi bật. Nếu bạn tiếp tục, chủ đề này sẽ thay thế chủ đề hiện có."
-        help: "Xóa liên kết đến chủ đề này trên hồ sơ người dùng của bạn"
-        title: "Xóa khỏi hồ sơ"
       list: "Chủ đề"
       new: "chủ đề mới"
       unread: "chưa đọc"
@@ -2417,8 +2407,6 @@ vi:
       whisper: "bài viết này là lời nhắn từ điều hành viên"
       wiki:
         about: "Bài viết này là một wiki"
-      archetypes:
-        save: "Lưu lựa chọn"
       few_likes_left: "Cám ơn bạn đã chia sẻ cảm nhận! Bạn chỉ còn lại vài lượt like cho ngày hôm nay."
       controls:
         reply: "bắt đầu soản trả lời cho bài viết này"
@@ -2530,6 +2518,7 @@ vi:
         name: "Tên"
         name_placeholder: "Đánh dấu này là gì?"
         set_reminder: "Nhắc nhở tôi"
+        options: "Lựa chọn"
         actions:
           delete_bookmark:
             name: "Xóa dấu trang"
@@ -2544,7 +2533,6 @@ vi:
         post_number: "%{username}, bài số #%{post_number}"
         show_all: "Hiển thị tất cả"
     category:
-      can: "can&hellip;"
       none: "(không danh mục)"
       all: "Tất cả danh mục"
       choose: "danh mục&hellip;"
@@ -2578,7 +2566,6 @@ vi:
       save_error: Có lỗi xảy ra khi lưu chuyên mục
       name: "Tên chuyên mục"
       description: "Mô tả"
-      topic: "chủ đề chuyên mục"
       logo: "Logo của chuyên mục"
       background_image: "Ảnh nền của chuyên mục"
       badge_colors: "Màu huy hiệu"
@@ -4390,7 +4377,6 @@ vi:
           perform: "Trao huy hiệu cho người dùng"
           upload_csv: Tải lên CSV có email hoặc tên người dùng
           aborted: Vui lòng tải lên CSV có chứa email người dùng hoặc tên người dùng
-          success: CSV của bạn đã được nhận và người dùng sẽ sớm nhận được huy hiệu của họ.
           replace_owners: Xóa huy hiệu khỏi chủ sở hữu trước đó
       emoji:
         title: "Emoji"
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index f5a66561b7..34f496dc48 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -40,6 +40,7 @@ zh_CN:
       long_date_without_year_with_linebreak: "M 月 D 日<br/>LT"
       long_date_with_year_with_linebreak: "YY 年 M 月 D 日<br/>LT"
       wrap_ago: "%{date} 前"
+      wrap_on: "%{date}"
       tiny:
         half_a_minute: "< 1 分钟"
         less_than_x_seconds:
@@ -51,7 +52,7 @@ zh_CN:
         x_minutes:
           other: "%{count} 分钟"
         about_x_hours:
-          other: "约 %{count} 小时"
+          other: "%{count} 小时"
         x_days:
           other: "%{count} 天"
         x_months:
@@ -100,7 +101,7 @@ zh_CN:
       twitter: "分享到 Twitter"
       facebook: "分享到 Facebook"
       email: "通过电子邮件发送"
-      url: "复制并分享网址"
+      url: "复制并分享 URL"
     action_codes:
       public_topic: "%{when}将此话题设为公开"
       private_topic: "%{when}将此话题转换为个人消息"
@@ -196,14 +197,13 @@ zh_CN:
     conduct: "行为准则"
     mobile_view: "移动版视图"
     desktop_view: "桌面版视图"
-    you: "您"
     or: "或者"
     now: "刚刚"
-    read_more: "阅读更多内容"
+    read_more: "阅读更多"
     more: "更多"
     x_more:
       other: "其他 %{count} 人"
-    never: "从未"
+    never: "从不"
     every_30_minutes: "每 30 分钟"
     every_hour: "每小时"
     daily: "每天"
@@ -221,7 +221,7 @@ zh_CN:
       pm_title: "建议的消息"
     about:
       simple_title: "关于"
-      title: "关于 %{title}"
+      title: "关于%{title}"
       stats: "站点统计信息"
       our_admins: "我们的管理员"
       our_moderators: "我们的版主"
@@ -240,10 +240,13 @@ zh_CN:
       contact_info: "如果出现影响此站点的关键问题或紧急事项，请联系我们：%{contact_info}。"
     bookmarked:
       title: "加入书签"
+      edit_bookmark: "编辑书签"
       clear_bookmarks: "清除书签"
       help:
         bookmark: "点击以将此话题的第一个帖子加入书签"
+        edit_bookmark: "点击以编辑有关此话题的书签"
         unbookmark: "点击以移除此话题中的所有书签"
+        unbookmark_with_reminder: "点击以移除此话题中的所有书签和提醒。"
     bookmarks:
       created: "您已将此帖子加入书签。%{name}"
       not_bookmarked: "将此帖子加入书签"
@@ -276,7 +279,7 @@ zh_CN:
       remove: "移除"
       remove_confirmation: "确定要删除此草稿吗？"
       new_topic: "新话题草稿"
-      new_private_message: "新私信草稿"
+      new_private_message: "新个人消息草稿"
       topic_reply: "草稿回复"
       abandon:
         confirm: "您在此话题下有一个进行中的草稿。您想对它做什么？"
@@ -313,23 +316,23 @@ zh_CN:
       close: "关闭此横幅。"
       edit: "编辑此横幅 >>"
     pwa:
-      install_banner: "要<a href>在此设备上安装 %{title}</a> 吗？"
+      install_banner: "要<a href>在此设备上安装%{title}</a> 吗？"
     choose_topic:
       none_found: "未找到话题。"
       title:
         search: "搜索话题"
-        placeholder: "在此处输入话题标题、网址或 ID"
+        placeholder: "在此处输入话题标题、URL 或 ID"
     choose_message:
       none_found: "未找到消息。"
       title:
         search: "搜索消息"
-        placeholder: "在此处输入消息标题、网址或 ID"
+        placeholder: "在此处输入消息标题、URL 或 ID"
     review:
       order_by: "排序依据"
       in_reply_to: "回复给"
       explain:
         why: "解释为什么此条目最终进入队列"
-        title: "可审查帖子的评分"
+        title: "可审核话题的评分"
         formula: "公式"
         subtotal: "小计"
         total: "总计"
@@ -340,19 +343,19 @@ zh_CN:
           title: "当管理人员选择采取行动时，举报会获得加分。"
         user_accuracy_bonus:
           name: "用户准确性"
-          title: "所提交的举报一直都获得确认的用户将获得加分。"
+          title: "所提交的举报一直都获得同意的用户将获得加分。"
         trust_level_bonus:
-          name: "信任等级"
-          title: "由较高信任级别的用户创建的可审查条目具有较高的分数。"
+          name: "信任级别"
+          title: "由较高信任级别的用户创建的可审核条目具有较高的分数。"
         type_bonus:
           name: "奖励加分"
-          title: "某些可审查类型可以由管理人员分配加分，以使其具有更高的优先级。"
-      stale_help: "此可审查对象已被其他人解决。"
+          title: "某些可审核类型可以由管理人员分配加分，以使其具有更高的优先级。"
+      stale_help: "此可审核条目已被 <b>%{username}</b> 解决。"
       claim_help:
-        optional: "您可以认领此条目以避免被他人审查。"
-        required: "您必须先认领条目才能进行审查。"
-        claimed_by_you: "您已认领此条目，可以进行审查。"
-        claimed_by_other: "此条目仅可以由 <b>%{username}</b> 审查。"
+        optional: "您可以认领此条目以避免被他人审核。"
+        required: "您必须先认领条目才能进行审核。"
+        claimed_by_you: "您已认领此条目，可以进行审核。"
+        claimed_by_other: "此条目仅可以由 <b>%{username}</b> 审核。"
       claim:
         title: "认领此话题"
       unclaim:
@@ -360,23 +363,23 @@ zh_CN:
       awaiting_approval: "需要审批"
       delete: "删除"
       settings:
-        saved: "已保存！"
+        saved: "已保存"
         save_changes: "保存变更"
         title: "设置"
         priorities:
-          title: "可审查对象优先级"
+          title: "可审核条目优先级"
       moderation_history: "审核历史记录"
       view_all: "查看全部"
       grouped_by_topic: "按话题分组"
-      none: "没有要审查的条目"
-      view_pending: "查看待审查条目"
+      none: "没有要审核的条目"
+      view_pending: "查看待审核条目"
       topic_has_pending:
         other: "此话题有 <b>%{count}</b> 个帖子等待审批"
-      title: "审查"
+      title: "审核"
       topic: "话题："
-      filtered_topic: "您已筛选到一个话题下的可审查内容。"
+      filtered_topic: "您已筛选到一个话题下的可审核内容。"
       filtered_user: "用户"
-      filtered_reviewed_by: "审查者"
+      filtered_reviewed_by: "审核人"
       show_all_topics: "显示所有话题"
       deleted_post: "（帖子已删除）"
       deleted_user: "（用户已删除）"
@@ -392,9 +395,9 @@ zh_CN:
         summary:
           other: "%{agreed}，%{disagreed}，%{ignored}（共 %{count} 个举报）"
         agreed:
-          other: "%{count}% 确认"
+          other: "%{count}% 同意"
         disagreed:
-          other: "%{count}% 否决"
+          other: "%{count}% 不同意"
         ignored:
           other: "%{count}% 忽略"
       topics:
@@ -407,7 +410,7 @@ zh_CN:
         unique_users:
           other: "%{count} 位用户"
       replies:
-        other: "%{count} 条回复"
+        other: "%{count} 个回复"
       edit: "编辑"
       save: "保存"
       cancel: "取消"
@@ -435,13 +438,13 @@ zh_CN:
       conversation:
         view_full: "查看完整对话"
       scores:
-        about: "此分数是根据举报者的信任等级、该用户以往举报的准确性以及被举报条目的优先级计算得出的。"
+        about: "此分数是根据举报人的信任等级、该用户以往举报的准确性以及被举报条目的优先级计算得出的。"
         score: "分数"
         date: "日期"
         type: "类型"
         status: "状态"
-        submitted_by: "提交者"
-        reviewed_by: "审查者"
+        submitted_by: "提交人"
+        reviewed_by: "审核人"
       statuses:
         pending:
           title: "待处理"
@@ -454,13 +457,13 @@ zh_CN:
         deleted:
           title: "已删除"
         reviewed:
-          title: "（所有已审查）"
+          title: "（所有已审核）"
         all:
           title: "（全部）"
       types:
         reviewable_flagged_post:
           title: "被举报的帖子"
-          flagged_by: "举报者"
+          flagged_by: "举报人"
         reviewable_queued_topic:
           title: "已加入队列的话题"
         reviewable_queued_post:
@@ -473,8 +476,8 @@ zh_CN:
         title: "帖子需要审批"
         description: "我们已收到您的帖子，不过需要由版主批准才能显示。请耐心等待。"
         pending_posts:
-          other: "您有 <strong>%{count}</strong> 个帖子正在审批。"
-        ok: "确认"
+          other: "您有 <strong>%{count}</strong> 个帖子等待处理。"
+        ok: "确定"
       example_username: "用户名"
       reject_reason:
         title: "您为什么拒绝此用户？"
@@ -497,12 +500,15 @@ zh_CN:
       tomorrow: "明天"
       post_local_date: "帖子中的日期"
       later_this_week: "本周晚些时候"
+      this_weekend: "本周末"
       start_of_next_business_week: "星期一"
       start_of_next_business_week_alt: "下周一"
+      two_weeks: "两周"
       next_month: "下个月"
+      six_months: "六个月"
       custom: "自定义日期和时间"
       relative: "相对时间"
-      none: "不需要"
+      none: "不需要时间/日期"
       last_custom: "上次自定义日期时间"
     user_action:
       user_posted_topic: "<a href='%{userUrl}'>%{user}</a> 发布了<a href='%{topicUrl}'>该话题</a>"
@@ -525,21 +531,22 @@ zh_CN:
       likes_given: "已送出"
       likes_received: "已收到"
       topics_entered: "已浏览"
-      topics_entered_long: "已浏览话题"
+      topics_entered_long: "浏览的话题"
       time_read: "阅读时长"
       topic_count: "话题"
-      topic_count_long: "已创建话题"
+      topic_count_long: "创建的话题"
       post_count: "回复"
       post_count_long: "回帖"
       no_results: "没有找到结果。"
-      days_visited: "访问"
+      days_visited: "访问天数"
       days_visited_long: "访问天数"
-      posts_read: "阅读"
+      posts_read: "已读"
       posts_read_long: "已读帖子"
       last_updated: "最近更新："
       total_rows:
         other: "%{count} 位用户"
       edit_columns:
+        title: "编辑目录列"
         save: "保存"
         reset_to_default: "重置为默认值"
       group:
@@ -550,12 +557,17 @@ zh_CN:
         add_user_to_group: "添加用户"
         remove_user_from_group: "移除用户"
         make_user_group_owner: "设为所有者"
-        remove_user_as_group_owner: "撤销所有者"
+        remove_user_as_group_owner: "撤消所有者"
     groups:
       member_added: "已添加"
-      member_requested: "请求时间"
+      member_requested: "请求日期"
       add_members:
+        title: "将用户添加到 %{group_name}"
+        description: "输入您要邀请加入群组中的用户列表或粘贴到逗号分隔的列表中："
+        usernames_placeholder: "用户名"
+        usernames_or_emails_placeholder: "用户名或电子邮件"
         notify_users: "通知用户"
+        set_owner: "设置用户为此群组的所有者"
       requests:
         title: "请求"
         reason: "原因"
@@ -569,6 +581,8 @@ zh_CN:
         title: "管理"
         name: "名称"
         full_name: "全名"
+        add_members: "添加用户"
+        invite_members: "邀请"
         delete_member_confirm: "要从群组 '%{group}' 中移除用户 '%{username}' 吗？"
         profile:
           title: 个人资料
@@ -583,6 +597,8 @@ zh_CN:
           enable_imap: "启用 IMAP"
           test_settings: "测试设置"
           save_settings: "保存设置"
+          last_updated: "最近更新："
+          last_updated_by: "更新者"
           settings_required: "所有设置均为必填项，请先填写所有字段，然后再进行验证。"
           smtp_settings_valid: "SMTP 设置有效。"
           smtp_title: "SMTP"
@@ -610,7 +626,8 @@ zh_CN:
             password: "密码"
           settings:
             title: "设置"
-            allow_unknown_sender_topic_replies: "允许未知发件人话题回复。"
+            allow_unknown_sender_topic_replies: "允许未知发件人回复话题。"
+            allow_unknown_sender_topic_replies_hint: "允许未知发件人回复群组话题。如果未启用此功能，且从未被邀请至该话题的电子邮件地址回复，将创建一个新话题。"
           mailboxes:
             synchronized: "已同步的邮箱"
             none_found: "未在此电子邮件帐户中找到任何邮箱。"
@@ -692,8 +709,6 @@ zh_CN:
         public: "公开"
         private: "不公开"
         public_groups: "公开群组"
-        automatic_group: 自动生成的群组
-        close_group: 关闭群组
         my_groups: "我的群组"
         group_type: "群组类型"
         is_group_user: "成员"
@@ -745,7 +760,7 @@ zh_CN:
       notifications:
         watching:
           title: "关注"
-          description: "您将在每个消息有新帖子时收到通知，并且会显示新回复数量。"
+          description: "您将在每条消息有新帖子时收到通知，并且会显示新回复数量。"
         watching_first_post:
           title: "关注第一个帖子"
           description: "您将收到此群组中新消息的通知，但不会收到消息回复。"
@@ -767,8 +782,13 @@ zh_CN:
       flair_preview_icon: "预览图标"
       flair_preview_image: "预览图片"
       flair_type:
-        icon: "选择图标"
+        icon: "选择一个图标"
         image: "上传图片"
+      default_notifications:
+        modal_title: "用户默认通知"
+        modal_description: "要回溯应用此变更吗？这将更改 %{count} 个现有用户的偏好设置。"
+        modal_yes: "是"
+        modal_no: "不，仅对以后应用变更"
     user_action_groups:
       "1": "赞"
       "2": "赞"
@@ -785,7 +805,7 @@ zh_CN:
       "15": "草稿"
     categories:
       all: "所有类别"
-      all_subcategories: "全部"
+      all_subcategories: "所有"
       no_subcategory: "无"
       category: "类别"
       category_list: "显示类别列表"
@@ -798,7 +818,6 @@ zh_CN:
       posts: "帖子"
       topics: "话题"
       latest: "最新"
-      toggle_ordering: "切换排序控制"
       subcategories: "子类别"
       muted: "已设为免打扰的类别"
       topic_sentence:
@@ -818,7 +837,7 @@ zh_CN:
     ip_lookup:
       title: IP 地址查询
       hostname: 主机名
-      location: 位置
+      location: 地点
       location_not_found: '（未知）'
       organisation: 组织
       phone: 电话
@@ -827,7 +846,7 @@ zh_CN:
       username: "用户名"
       trust_level: "信任级别"
       read_time: "阅读时间"
-      topics_entered: "进入的话题"
+      topics_entered: "参与的话题"
       post_count: "帖子数量"
       confirm_delete_other_accounts: "确定要删除这些帐户吗？"
       powered_by: "使用 <a href='https://maxmind.com'>MaxMindDB</a>"
@@ -838,20 +857,20 @@ zh_CN:
     user:
       said: "%{username}："
       profile: "个人资料"
-      mute: "忽略"
+      mute: "免打扰"
       edit: "编辑偏好设置"
       download_archive:
         button_text: "全部下载"
         confirm: "确定要下载您的帖子吗？"
         success: "下载已开始，完成后将通过消息通知您。"
-        rate_limit_error: "帖子只能每天下载一次，请明天再试。"
+        rate_limit_error: "帖子每天只能下载一次，请明天再试。"
       new_private_message: "新消息"
       private_message: "消息"
       private_messages: "消息"
       user_notifications:
         filters:
           filter_by: "筛选依据"
-          all: "全部"
+          all: "所有"
           read: "已读"
           unread: "未读"
         ignore_duration_title: "忽略用户"
@@ -883,7 +902,7 @@ zh_CN:
         sunday: "星期日"
         to: "至"
       activity_stream: "活动"
-      read: "阅读"
+      read: "已读"
       read_help: "最近阅读的话题"
       preferences: "偏好设置"
       feature_topic_on_profile:
@@ -925,6 +944,8 @@ zh_CN:
       no_bookmarks_body: >
         使用 %{icon} 按钮开始将帖子加入书签，它们将出现在这里，便于参考。您也可以安排提醒！
       no_notifications_title: "您还没有任何通知"
+      no_notifications_body: >
+        您将直接在此面板上收到与您相关的活动通知，包括对您的话题和帖子的回复，以及当有人<b>提及 (@)</b> 您或引用您以及回复您关注的话题时。当您有一段时间没有登录时，通知还将发送到您的电子邮件。<br><br>查找 %{icon} 以决定您想收到通知的具体话题、类别和标签。有关详情，请参阅您的<a href='%{preferencesUrl}'>通知偏好设置</a>。
       first_notification: "您的第一个通知！选中它以开始。"
       dynamic_favicon: "在浏览器图标上显示数量"
       skip_new_user_tips:
@@ -957,7 +978,7 @@ zh_CN:
       moderator_tooltip: "此用户是版主"
       admin_tooltip: "此用户是管理员"
       silenced_tooltip: "此用户已被禁言"
-      suspended_notice: "此用户已被封禁到 %{date}。"
+      suspended_notice: "此用户已被封禁至 %{date}。"
       suspended_permanently: "此用户已被封禁。"
       suspended_reason: "原因："
       github_profile: "GitHub"
@@ -966,7 +987,7 @@ zh_CN:
         label: "邮寄名单模式"
         enabled: "启用邮寄名单模式"
         instructions: |
-          此设置将覆盖活动摘要。<br />
+          此设置将替换活动摘要。<br />
           已设为免打扰的话题和类别将不会被包含在这些电子邮件中。
         individual: "为每个新帖子发送一封电子邮件"
         individual_no_echo: "为除了我发表的新帖子之外的每个新帖子发送一封电子邮件"
@@ -1002,17 +1023,17 @@ zh_CN:
       admin_delete: "删除"
       users: "用户"
       muted_users: "已设为免打扰"
-      muted_users_instructions: "屏蔽来自这些用户的所有通知和私信。"
+      muted_users_instructions: "屏蔽来自这些用户的所有通知和 PM。"
       allowed_pm_users: "已允许"
-      allowed_pm_users_instructions: "仅允许来自这些用户的私信。"
+      allowed_pm_users_instructions: "仅允许来自这些用户的 PM。"
       allow_private_messages_from_specific_users: "仅允许特定用户向我发送个人消息"
       ignored_users: "已忽略"
-      ignored_users_instructions: "屏蔽来自这些用户的所有帖子、通知和私信。"
+      ignored_users_instructions: "屏蔽来自这些用户的所有帖子、通知和 PM。"
       tracked_topics_link: "显示"
       automatically_unpin_topics: "当我到达底部时自动取消置顶话题。"
       apps: "应用"
       revoke_access: "撤消访问权限"
-      undo_revoke_access: "撤消撤消访问权限"
+      undo_revoke_access: "撤消访问权限撤消操作"
       api_approved: "已批准："
       api_last_used_at: "最后使用时间："
       theme: "主题"
@@ -1032,10 +1053,11 @@ zh_CN:
         sent: "已发送"
         archive: "归档"
         groups: "我的群组"
-        move_to_inbox: "移动到收件箱"
+        move_to_inbox: "移至收件箱"
         move_to_archive: "归档"
         failed_to_move: "无法移动所选消息（可能您的网络已掉线）"
         tags: "标签"
+        warnings: "官方警告"
       preferences_nav:
         account: "帐户"
         security: "安全性"
@@ -1099,7 +1121,7 @@ zh_CN:
         disable_confirm: "确定要禁用所有的双重方法吗？"
         save: "保存"
         edit: "编辑"
-        edit_title: "添加身份验证器"
+        edit_title: "编辑身份验证器"
         edit_description: "身份验证器名称"
         enable_security_key_description: |
           准备好<a href="https://www.google.com/search?q=hardware+security+key" target="_blank">硬件安全密钥</a>后，请按下面的“注册”按钮。
@@ -1240,11 +1262,10 @@ zh_CN:
         browser_active: '%{browser} | <span class="active">正在使用</span>'
         browser_last_seen: "%{browser} | %{date}"
       last_posted: "最后一个帖子"
-      last_emailed: "最后一次发送电子邮件"
       last_seen: "最后活动"
       created: "加入日期："
       log_out: "退出"
-      location: "位置"
+      location: "地点"
       website: "网站"
       email_settings: "电子邮件"
       hide_profile_and_presence: "隐藏我的公开个人资料和状态功能"
@@ -1280,7 +1301,7 @@ zh_CN:
         every_month: "每月"
         every_six_months: "每六个月"
       email_level:
-        title: "当有人引用我的话、回复我的帖子、提及我的用户名或邀请我参与某个话题时，给我发送电子邮件"
+        title: "当有人引用我的话、回复我的帖子、提及我的用户名或邀请我加入某个话题时，给我发送电子邮件"
         always: "始终"
         only_when_away: "只在离开时"
         never: "从不"
@@ -1322,7 +1343,7 @@ zh_CN:
         groups: "群组"
         topic: "话题"
         sent: "创建/上次发送日期"
-        expires_at: "到期时间"
+        expires_at: "过期时间"
         edit: "编辑"
         remove: "移除"
         copy_link: "获取链接"
@@ -1337,7 +1358,7 @@ zh_CN:
         redeemed: "已确认的邀请"
         redeemed_at: "已确认"
         pending: "待处理邀请"
-        topics_entered: "已浏览话题"
+        topics_entered: "浏览的话题"
         posts_read_count: "已读帖子"
         expired: "此邀请已过期。"
         remove_all: "移除过期的邀请"
@@ -1364,9 +1385,18 @@ zh_CN:
         invite:
           new_title: "创建邀请"
           edit_title: "编辑邀请"
+          instructions: "分享此链接可立即授予访问此站点的权限"
           copy_link: "复制链接"
+          expires_in_time: "于 %{time}过期"
+          expired_at_time: "过期时间为 %{time}"
           show_advanced: "显示高级选项"
           hide_advanced: "隐藏高级选项"
+          restrict_email: "限制为一个电子邮件地址"
+          max_redemptions_allowed: "最大使用次数"
+          add_to_groups: "添加到群组"
+          invite_to_topic: "到达此话题"
+          expires_at: "过期时间"
+          custom_message: "可选个人信息"
           send_invite_email: "保存并发送电子邮件"
           save_invite: "保存邀请"
           invite_saved: "邀请已保存。"
@@ -1396,9 +1426,9 @@ zh_CN:
         time_read: "阅读时间"
         recent_time_read: "最近阅读时间"
         topic_count:
-          other: "已创建话题"
+          other: "创建的话题"
         post_count:
-          other: "已创建帖子"
+          other: "创建的帖子"
         likes_given:
           other: "已送出"
         likes_received:
@@ -1406,7 +1436,7 @@ zh_CN:
         days_visited:
           other: "访问天数"
         topics_entered:
-          other: "已浏览话题"
+          other: "浏览的话题"
         posts_read:
           other: "已读帖子"
         bookmark_count:
@@ -1423,7 +1453,7 @@ zh_CN:
         top_links: "热门链接"
         no_links: "暂无链接。"
         most_liked_by: "被谁赞得最多"
-        most_liked_users: "赞谁最多"
+        most_liked_users: "赞最多"
         most_replied_to_users: "最多回复至"
         no_likes: "暂无赞。"
         top_categories: "热门类别"
@@ -1441,11 +1471,16 @@ zh_CN:
       title:
         title: "头衔"
         none: "（无）"
+        instructions: "出现在您的用户名之后"
+      flair:
+        title: "资质"
+        none: "（无）"
+        instructions: "图标显示在您的个人资料照片旁边"
       primary_group:
         title: "主要群组"
         none: "（无）"
       filters:
-        all: "全部"
+        all: "所有"
       stream:
         posted_by: "发帖人"
         sent_by: "发送人"
@@ -1492,7 +1527,7 @@ zh_CN:
     logs_error_rate_notice:
       reached_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# 个错误/小时} other {# 个错误/小时}}</a>达到了站点设置中 {limit, plural, one {# 个错误/小时} other {# 个错误/小时}}的限制。"
       reached_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# 个错误/分钟} other {# 个错误/分钟}}</a>达到了站点设置中 {limit, plural, one {# 个错误/分钟} other {# 个错误/分钟}}的限制。"
-      exceeded_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# 个错误/小时} other {# 个错误/小时}}</a>达到了站点设置中 {limit, plural, one {# 个错误/小时} other {# 个错误/小时}}的限制。"
+      exceeded_hour_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# 个错误/小时} other {# 个错误/小时}}</a>超过了站点设置中 {limit, plural, one {# 个错误/小时} other {# 个错误/小时}}的限制。"
       exceeded_minute_MF: "<b>{relativeAge}</b> – <a href='{url}' target='_blank'>{rate, plural, one {# 个错误/分钟} other {# 个错误/分钟}}</a>超过了站点设置中 {limit, plural, one {# 个错误/分钟} other {# 个错误/分钟}}的限制。"
     learn_more: "了解更多…"
     first_post: 第一个帖子
@@ -1511,7 +1546,7 @@ zh_CN:
       sign_up: "注册"
       hide_session: "明天提醒我"
       hide_forever: "不，谢谢"
-      hidden_for_session: "好的，我们会在明天问你。您也可以随时使用“登录”来创建帐户。"
+      hidden_for_session: "好的，我们会在明天问您。您也可以随时使用“登录”来创建帐户。"
       intro: "您好！看起来您很喜欢讨论，但您还没有注册帐户。"
       value_prop: "当您创建帐户时，我们会准确记住您阅读过的内容，因此您总可以从上次停止的地方返回。每当有人回复您时，您还会在此处和通过电子邮件收到通知。您可以为帖子点赞来分享爱。 :heartpulse:"
     summary:
@@ -1538,8 +1573,8 @@ zh_CN:
     email: "电子邮件"
     username: "用户名"
     last_seen: "最后活动"
-    created: "创建日期"
-    created_lowercase: "创建日期"
+    created: "创建"
+    created_lowercase: "创建"
     trust_level: "信任级别"
     search_hint: "用户名、电子邮件或 IP 地址"
     create_account:
@@ -1550,7 +1585,7 @@ zh_CN:
       failed: "出了点问题，可能此电子邮件已被注册，试试点击忘记密码链接"
     forgot_password:
       title: "密码重置"
-      action: "我忘记了我的密码"
+      action: "我忘记密码了"
       invite: "输入您的用户名或电子邮件地址，我们将向您发送密码重置电子邮件。"
       reset: "重置密码"
       complete_username: "如果存在与用户名 <b>%{username}</b> 相匹配的帐户，您应该会收到一封电子邮件，其中包含有关如何尽快重置密码的说明。"
@@ -1571,7 +1606,7 @@ zh_CN:
       complete_email: "如果存在与 <b>%{email}</b> 相匹配的帐户，您应该很快就会收到一封包含登录链接的电子邮件。"
       complete_username_found: "我们找到一个与用户名 <b>%{username}</b> 相匹配的帐户，您应该很快就会收到一封包含登录链接的电子邮件。"
       complete_email_found: "我们找到一个与 <b>%{email}</b> 相匹配的帐户，您应该很快就会收到一封包含登录链接的电子邮件。"
-      complete_username_not_found: "没有与用户名 <b>%{username}</b> 相匹配的账户"
+      complete_username_not_found: "没有与用户名 <b>%{username}</b> 相匹配的帐户"
       complete_email_not_found: "没有与 <b>%{email}</b> 相匹配的帐户"
       confirm_title: 继续访问 %{site_name}
       logging_in_as: 以 %{email} 登录
@@ -1666,7 +1701,7 @@ zh_CN:
       facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "仅类别"
-      categories_with_featured_topics: "有精选话题的类别"
+      categories_with_featured_topics: "包含精选话题的类别"
       categories_and_latest_topics: "类别和最新话题"
       categories_and_top_topics: "类别和热门话题"
       categories_boxes: "带子类别的框"
@@ -1742,7 +1777,7 @@ zh_CN:
       add_warning: "这是一个官方警告。"
       toggle_whisper: "切换密语"
       toggle_unlisted: "切换取消公开"
-      posting_not_on_topic: "您想回复哪个主题？"
+      posting_not_on_topic: "您想回复哪个话题？"
       saved_local_draft_tip: "已保存到本地"
       similar_topics: "您的话题类似于…"
       drafts_offline: "离线草稿"
@@ -1753,7 +1788,7 @@ zh_CN:
         other: "提及 %{group} 时，您将通知 <a href='%{group_link}'>%{count} 人</a> － 确定吗？"
       cannot_see_mention:
         category: "您提及了 %{username}，但由于他们无法访问此类别，他们将不会收到通知。您需要将其添加到可以访问此类别的群组中。"
-        private: "您提及了 %{username}，但由于他们无法访问此个人消息，他们将不会收到通知。您需要邀请他们参与此个人消息。"
+        private: "您提及了 %{username}，但由于他们无法访问此个人消息，他们将不会收到通知。您需要邀请他们加入此个人消息。"
       duplicate_link: "好像 <b>@%{username}</b> 在<a href='%{post_url}'>%{ago}的回复</a>中已经发布 <b>%{domain}</b> 的链接 - 确定要再次发布吗？"
       reference_topic_title: "回复：%{title}"
       error:
@@ -1851,7 +1886,7 @@ zh_CN:
           confirm: 您保存了一个新的话题草稿，如果您创建链接话题，它将被覆盖。
         reply_as_new_group_message:
           label: 作为新群组消息回复
-          desc: 创建收件人相同的新私信
+          desc: 创建以相同收件人开头的新消息
         reply_as_private_message:
           label: 新建消息
           desc: 创建新的个人消息
@@ -1883,11 +1918,11 @@ zh_CN:
       none: "目前无法加载通知。"
       empty: "找不到通知。"
       post_approved: "您的帖子已被批准"
-      reviewable_items: "需要审查的条目"
+      reviewable_items: "需要审核的条目"
       mentioned: "<span>%{username}</span> %{description}"
       group_mentioned: "<span>%{username}</span> %{description}"
       quoted: "<span>%{username}</span> %{description}"
-      bookmark_reminder: "<span>%{username}</span>%{description}"
+      bookmark_reminder: "<span>%{username}</span> %{description}"
       replied: "<span>%{username}</span> %{description}"
       posted: "<span>%{username}</span> %{description}"
       edited: "<span>%{username}</span> %{description}"
@@ -1897,7 +1932,7 @@ zh_CN:
         other: "<span class='multi-user'>%{username}、%{username2} 和其他 %{count} 人</span> %{description}"
       liked_consolidated_description:
         other: "点赞了您的 %{count} 个帖子"
-      liked_consolidated: "<span>%{username}</span>%{description}"
+      liked_consolidated: "<span>%{username}</span> %{description}"
       private_message: "<span>%{username}</span> %{description}"
       invited_to_private_message: "<p><span>%{username}</span> %{description}"
       invited_to_topic: "<span>%{username}</span> %{description}"
@@ -1922,11 +1957,11 @@ zh_CN:
         replied: '%{username} 在“%{topic}”中回复了您 - %{site_title}'
         posted: '%{username} 在“%{topic}”中发布了帖子 - %{site_title}'
         private_message: '%{username} 在“%{topic}”中向您发送了个人消息 - %{site_title}'
-        linked: '%{username} 在“%{topic}”中链接到您的帖子 - %{site_title}'
+        linked: '%{username} 链接到您在“%{topic}”中的帖子 - %{site_title}'
         watching_first_post: '%{username} 创建了新话题“%{topic}”- %{site_title}'
-        confirm_title: "通知已启用 - %{site_title}"
-        confirm_body: "成功！通知已启用。"
-        custom: "来自 %{username} 在 %{site_title} 的通知"
+        confirm_title: "已启用通知 - %{site_title}"
+        confirm_body: "成功！已启用通知。"
+        custom: "来自%{site_title}上 %{username} 的通知"
       titles:
         mentioned: "被提及"
         replied: "新回复"
@@ -1934,7 +1969,7 @@ zh_CN:
         edited: "被编辑"
         liked: "新赞"
         private_message: "新私信"
-        invited_to_private_message: "被邀请参与私信"
+        invited_to_private_message: "被邀请加入私信"
         invitee_accepted: "邀请已被接受"
         posted: "新帖子"
         moved_post: "帖子已被移动"
@@ -1942,18 +1977,19 @@ zh_CN:
         bookmark_reminder: "书签提醒"
         bookmark_reminder_with_name: "书签提醒 - %{name}"
         granted_badge: "已授予徽章"
-        invited_to_topic: "被邀请参与话题"
+        invited_to_topic: "被邀请加入话题"
         group_mentioned: "群组提及"
         group_message_summary: "新群组消息"
         watching_first_post: "新话题"
         topic_reminder: "话题提醒"
         liked_consolidated: "新赞"
-        post_approved: "帖子被批准"
+        post_approved: "已批准帖子"
         membership_request_consolidated: "新成员资格请求"
         reaction: "新回应"
         votes_released: "投票额度已释放"
     upload_selector:
       uploading: "正在上传"
+      processing: "正在处理上传"
       select_file: "选择文件"
       default_image_alt_text: 图片
     search:
@@ -2013,7 +2049,7 @@ zh_CN:
           pinned: 被置顶
           seen: 我读过
           unseen: 我还没读过
-          wiki: wiki
+          wiki: Wiki
           images: 包含图片
           all_tags: 上述所有标签
         statuses:
@@ -2026,7 +2062,7 @@ zh_CN:
           single_user: 包含一个用户
         post:
           count:
-            label: 帖子数量
+            label: 帖子
           min:
             placeholder: 最小值
           max:
@@ -2058,10 +2094,16 @@ zh_CN:
         delete: "删除话题"
         dismiss: "关闭"
         dismiss_read: "关闭所有未读话题"
+        dismiss_read_with_selected:
+          other: "关闭 %{count} 个未读"
         dismiss_button: "关闭…"
+        dismiss_button_with_selected:
+          other: "关闭（%{count} 个）…"
         dismiss_tooltip: "仅关闭新帖子或停止跟踪话题"
         also_dismiss_topics: "停止跟踪这些话题，以便它们不再显示为我的未读话题"
         dismiss_new: "关闭新话题"
+        dismiss_new_with_selected:
+          other: "关闭新话题（%{count} 个）…"
         toggle: "切换话题批量选择"
         actions: "批量操作"
         change_category: "设置类别"
@@ -2094,6 +2136,7 @@ zh_CN:
         top: "没有热门话题。"
         educate:
           new: '<p>您的新话题将显示在这里。默认情况下，如果是在过去 2 天内创建的，话题会被视为新话题，还会显示 <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> 指示器。</p><p>访问您的<a href="%{userPrefsUrl}">偏好设置</a>可以更改此设置。</p>'
+          unread: "<p>您的未读话题显示在这里。</p><p>默认情况下，如果符合以下条件，话题会被视为未读并且还将显示未读计数 <span class=\"badge unread-posts badge-notification\">1</span>：</p><ul><li>您创建了该话题</li><li>您回复了该话题</li><li>您阅读该话题超过 4 分钟</li></ul><p>或者如果您在每个话题中通过 \U0001F514 将话题显式设为“已跟踪”或“已关注”。</p><p>访问您的<a href=\"%{userPrefsUrl}\">偏好设置</a>可以更改此设置。</p>"
       bottom:
         latest: "没有更多最新话题了。"
         posted: "没有更多已发布话题了。"
@@ -2123,13 +2166,6 @@ zh_CN:
       defer:
         help: "标记为未读"
         title: "推迟"
-      feature_on_profile:
-        help: "在您的用户卡和个人资料上添加指向此话题的链接"
-        title: "精选到个人资料"
-      remove_from_profile:
-        warning: "您的个人资料已有精选话题。如果继续，此话题将替换现有话题。"
-        help: "在您的用户个人资料中移除指向此话题的链接"
-        title: "从个人资料中移除"
       list: "话题"
       new: "新话题"
       unread: "未读"
@@ -2139,7 +2175,7 @@ zh_CN:
         other: "%{count} 个未读话题"
       title: "话题"
       invalid_access:
-        title: "这是私密话题"
+        title: "不公开话题"
         description: "抱歉，您无权访问该话题！"
         login_required: "您需要登录才能查看该话题。"
       server_error:
@@ -2148,6 +2184,8 @@ zh_CN:
       not_found:
         title: "找不到话题"
         description: "抱歉，我们找不到该话题。也许它被版主移除了？"
+      unread_posts:
+        other: "您在此话题中有 %{count} 个未读帖子"
       likes:
         other: "此话题有 %{count} 个赞"
       back_to_list: "返回话题列表"
@@ -2158,11 +2196,12 @@ zh_CN:
       read_more_in_category: "想阅读更多？浏览%{catLink}或%{latestLink}中的其他话题。"
       read_more: "想阅读更多？%{catLink}或%{latestLink}。"
       unread_indicator: "还没有成员读过此话题的最新帖子。"
-      read_more_MF: "还有{ UNREAD, plural, =0 {} other { <a href='{basePath}/unread'># 个未读</a>} }{ NEW, plural, =0 {} other {{BOTH, select, true{和} false { } other{}} <a href='{basePath}/new'># 个新</a>话题} }，或者{CATEGORY, select, true {浏览{catLink}中的其他话题} false {{latestLink}} other {}}"
+      read_more_MF: "还有{ UNREAD, plural, =0 {} other { <a href='{basePath}/unread'># 个未读</a>} }{ NEW, plural, =0 {} other {{BOTH, select, true{和} false {} other{}} <a href='{basePath}/new'># 个新</a>话题} }，或者{CATEGORY, select, true {浏览{catLink}中的其他话题} false {{latestLink}} other {}}"
       bumped_at_title_MF: "{FIRST_POST}：{CREATED_AT}\n{LAST_POST}：{BUMPED_AT}"
       browse_all_categories: 浏览所有类别
       browse_all_tags: 浏览所有标签
       view_latest_topics: 查看最新话题
+      suggest_create_topic: 准备好<a href>开始新对话</a>了吗？
       jump_reply_up: 跳转到较早的回复
       jump_reply_down: 跳转到较晚的回复
       deleted: "该话题已被删除"
@@ -2199,7 +2238,7 @@ zh_CN:
         remove: "移除计时器"
         publish_to: "发布至："
         when: "时间："
-        time_frame_required: "请选择一个时间范围"
+        time_frame_required: "请选择时间范围"
         min_duration: "持续时间必须大于 0"
         max_duration: "持续时间必须小于 20 年"
       auto_update_input:
@@ -2224,6 +2263,8 @@ zh_CN:
         title: "排定发布时间表"
       temp_open:
         title: "临时开启"
+      auto_reopen:
+        title: "自动打开话题"
       temp_close:
         title: "临时关闭"
       auto_close:
@@ -2244,7 +2285,7 @@ zh_CN:
       status_update_notice:
         auto_open: "此话题将在 %{timeLeft}后自动开启。"
         auto_close: "此话题将在 %{timeLeft}后自动关闭。"
-        auto_publish_to_category: "此话题将在%{timeLeft}后发布到<a href=%{categoryUrl}>#%{categoryName}</a>。"
+        auto_publish_to_category: "此话题将在 %{timeLeft}后发布到<a href=%{categoryUrl}>#%{categoryName}</a>。"
         auto_close_after_last_post: "此话题将在最后一个帖子的%{duration}后关闭。"
         auto_delete: "此话题将在 %{timeLeft}后自动删除。"
         auto_bump: "此话题将在 %{timeLeft}后自动顶帖。"
@@ -2270,7 +2311,7 @@ zh_CN:
           other: "/%{count} 个帖子"
         jump_prompt_long: "跳转到…"
         jump_bottom_with_number: "跳转到帖子 %{post_number}"
-        jump_prompt_to_date: "到日期"
+        jump_prompt_to_date: "截至日期"
         jump_prompt_or: "或者"
         total: 帖子总数
         current: 当前帖子
@@ -2343,6 +2384,7 @@ zh_CN:
         pin: "置顶话题"
         unpin: "取消置顶话题"
         pin_globally: "全局置顶话题"
+        make_banner: "设为横幅话题"
         remove_banner: "移除横幅话题"
       reply:
         title: "回复"
@@ -2396,12 +2438,12 @@ zh_CN:
       inviting: "正在邀请…"
       automatically_add_to_groups: "此邀请还包括以下群组的访问权限："
       invite_private:
-        title: "邀请参与消息"
+        title: "邀请加入消息"
         email_or_username: "受邀者的电子邮件或用户名"
         email_or_username_placeholder: "电子邮件地址或者用户名"
         action: "邀请"
-        success: "我们已邀请该用户参与此消息。"
-        success_group: "我们已邀请该群组参与此消息。"
+        success: "我们已邀请该用户加入此消息。"
+        success_group: "我们已邀请该群组加入此消息。"
         error: "抱歉，邀请该用户时出错。"
         not_allowed: "抱歉，无法邀请该用户。"
         group_name: "群组名称"
@@ -2410,18 +2452,18 @@ zh_CN:
         title: "邀请"
         username_placeholder: "用户名"
         action: "发送邀请"
-        help: "通过电子邮件或通知邀请其他人参与此话题"
+        help: "通过电子邮件或通知邀请其他人加入此话题"
         to_forum: "我们将发送一封简短的电子邮件，让您的朋友可以通过点击链接立即加入。"
-        discourse_connect_enabled: "输入您要邀请参与此话题的人员的用户名。"
-        to_topic_blank: "输入您要邀请参与此话题的人员的用户名或者电子邮件地址。"
+        discourse_connect_enabled: "输入您要邀请加入此话题的人员的用户名。"
+        to_topic_blank: "输入您要邀请加入此话题的人员的用户名或者电子邮件地址。"
         to_topic_email: "您输入了一个电子邮件地址。我们将通过电子邮件发送邀请，让您的朋友可以直接回复此话题。"
-        to_topic_username: "您输入了一个用户名。我们将向其发送通知，其中包含邀请他们参与此话题的链接。"
-        to_username: "输入您想邀请的人的用户名。我们将向其发送通知，其中包含邀请他们参与此话题的链接。"
+        to_topic_username: "您输入了一个用户名。我们将向其发送通知，其中包含邀请他们加入此话题的链接。"
+        to_username: "输入您想邀请的人的用户名。我们将向其发送通知，其中包含邀请他们加入此话题的链接。"
         email_placeholder: "name@example.com"
         success_email: "我们已向 <b>%{invitee}</b> 发送邀请。在邀请被确认后，我们将通知您。查看您的用户页面上的邀请标签页以跟踪邀请进度。"
-        success_username: "我们已邀请该用户参与此话题。"
+        success_username: "我们已邀请该用户加入此话题。"
         error: "抱歉，我们无法邀请此人。也许他们已经被邀请了？（邀请次数受限）"
-        success_existing_email: "电子邮件为 <b>%{emailOrUsername}</b> 的用户已存在。我们已邀请该用户参与此话题。"
+        success_existing_email: "电子邮件为 <b>%{emailOrUsername}</b> 的用户已存在。我们已邀请该用户加入此话题。"
       login_reply: "登录以回复"
       filters:
         n_posts:
@@ -2453,7 +2495,7 @@ zh_CN:
         radio_label: "新消息"
         participants: "参与者"
         instructions:
-          other: "您将创建一个新消息，并使用您选择的 <b>%{count}</b> 个帖子填充。"
+          other: "您将创建一条新消息，并使用您选择的 <b>%{count}</b> 个帖子填充。"
       move_to_existing_message:
         title: "移至现有消息"
         action: "移至现有消息"
@@ -2471,7 +2513,7 @@ zh_CN:
         description: "当一个话题作为一个页面发布时，可以分享它的 URL，并且它将以自定义样式显示。"
         slug: "缩略名"
         public: "公开"
-        public_description: "即使关联的话题是私有话题，用户也可以看到该页面。"
+        public_description: "即使关联的话题是不公开话题，用户也可以看到该页面。"
         publish_url: "您的页面已发布到："
         topic_published: "您的话题已发布到："
         preview_url: "您的页面将发布到："
@@ -2521,12 +2563,12 @@ zh_CN:
       quote_share: "分享"
       edit_reason: "原因："
       post_number: "帖子 %{number}"
-      ignored: "已忽略的内容"
-      wiki_last_edited_on: "wiki 最后编辑于 %{dateTime}"
+      ignored: "忽略的内容"
+      wiki_last_edited_on: "Wiki 最后编辑于 %{dateTime}"
       last_edited_on: "帖子最后编辑于 %{dateTime}"
       reply_as_new_topic: "作为链接话题回复"
       reply_as_new_private_message: "作为新消息回复给相同的收件人"
-      continue_discussion: "自 %{postLink} 继续讨论："
+      continue_discussion: "从%{postLink}继续讨论："
       follow_quote: "转到引用的帖子"
       show_full: "显示完整帖子"
       show_hidden: "查看已忽略的内容。"
@@ -2552,7 +2594,7 @@ zh_CN:
       filtered_replies_hint:
         other: "查看此帖子及其 %{count} 个回复"
       filtered_replies_viewing:
-        other: "查看 %{count} 个回复"
+        other: "正在查看对此用户的 %{count} 个回复："
       in_reply_to: "加载父帖子"
       view_all_posts: "查看所有帖子"
       errors:
@@ -2563,7 +2605,7 @@ zh_CN:
         too_many_uploads: "抱歉，一次只能上传一个文件。"
         too_many_dragged_and_dropped_files:
           other: "抱歉，一次只能上传 %{count} 个文件。"
-        upload_not_authorized: "抱歉，您尝试上传的文件不受支持（支持的扩展名：%{authorized_extensions}）。"
+        upload_not_authorized: "抱歉，您尝试上传的文件不被允许（允许的扩展名：%{authorized_extensions}）。"
         image_upload_not_allowed_for_new_user: "抱歉，新用户无法上传图片。"
         attachment_upload_not_allowed_for_new_user: "抱歉，新用户无法上传附件。"
         attachment_download_requires_login: "抱歉，您需要登录才能下载附件。"
@@ -2572,13 +2614,11 @@ zh_CN:
         discard: "舍弃"
         save_draft: "保存草稿供以后使用"
         keep_editing: "继续编辑"
-      via_email: "通过邮件发表的帖子"
-      via_auto_generated_email: "通过自动生成邮件发表的帖子"
+      via_email: "此帖子通过电子邮件送达"
+      via_auto_generated_email: "此帖子通过自动生成的电子邮件送达"
       whisper: "此帖子是对版主的密语"
       wiki:
-        about: "此帖子是 wiki"
-      archetypes:
-        save: "保存选项"
+        about: "此帖子是一个 Wiki"
       few_likes_left: "谢谢您分享爱！您今天只剩下几个赞了。"
       controls:
         reply: "开始撰写对此帖子的回复"
@@ -2642,7 +2682,7 @@ zh_CN:
           off_topic: "您将此帖子举报为偏离话题"
           spam: "您将此帖子举报为垃圾信息"
           inappropriate: "您将此帖子举报为不当言论"
-          notify_moderators: "您将此帖子举报为需要由版主核实"
+          notify_moderators: "您将此帖子举报为需要由版主审核"
           notify_user: "您向此用户发送了一条消息"
       delete:
         confirm:
@@ -2652,22 +2692,22 @@ zh_CN:
           other: "确定要合并这 %{count} 个帖子吗？"
       revisions:
         controls:
-          first: "第一版"
-          previous: "上一版"
-          next: "下一版"
-          last: "最新版"
-          hide: "隐藏版本历史"
-          show: "显示版本历史"
-          revert: "还原到版本 %{revision}"
+          first: "第一个修订"
+          previous: "上一个修订"
+          next: "下一个修订"
+          last: "上次修订"
+          hide: "隐藏修订"
+          show: "显示修订"
+          revert: "还原到修订 %{revision}"
           edit_wiki: "编辑 Wiki"
           edit_post: "编辑帖子"
           comparing_previous_to_current_out_of_total: "<strong>%{previous}</strong> %{icon} <strong>%{current}</strong> / %{total}"
         displays:
           inline:
-            title: "内联显示带有添加和删除的渲染输出"
+            title: "内联显示带有添加和删除的呈现输出"
             button: "HTML"
           side_by_side:
-            title: "并排显示渲染的输出差异"
+            title: "并排显示呈现的输出差异"
             button: "HTML"
           side_by_side_markdown:
             title: "并排显示原始源代码差异"
@@ -2687,10 +2727,11 @@ zh_CN:
         create: "创建书签"
         edit: "编辑书签"
         created: "已创建"
-        updated: "已更新"
+        updated: "更新"
         name: "名称"
         name_placeholder: "此书签有什么用？"
         set_reminder: "提醒我"
+        options: "选项"
         actions:
           delete_bookmark:
             name: "删除书签"
@@ -2707,11 +2748,10 @@ zh_CN:
       filtered_replies:
         viewing_posts_by: "正在查看此用户的 %{post_count} 个帖子："
         viewing_subset: "某些回复已被收起"
-        viewing_summary: "查看此话题的摘要"
+        viewing_summary: "正在查看此话题的摘要"
         post_number: "%{username}，帖子 #%{post_number}"
         show_all: "全部显示"
     category:
-      can: "能够&hellip;"
       none: "（无类别）"
       all: "所有类别"
       choose: "类别&hellip;"
@@ -2740,12 +2780,11 @@ zh_CN:
       create_long: "创建新类别"
       save: "保存类别"
       slug: "类别缩略名"
-      slug_placeholder: "（可选）用于 URL 以“-”分隔的单词"
+      slug_placeholder: "（可选）用于 URL 以“-”分隔的字词"
       creation_error: 创建类别时出错。
       save_error: 保存类别时出错。
       name: "类别名称"
       description: "描述"
-      topic: "类别话题"
       logo: "类别徽标图片"
       background_image: "类别背景图片"
       badge_colors: "徽章颜色"
@@ -2783,10 +2822,10 @@ zh_CN:
       mailinglist_mirror: "类别镜像一个邮寄名单"
       show_subcategory_list: "在此类别中的话题上方显示子类别列表。"
       read_only_banner: "用户无法在此类别中创建话题时的横幅文本："
-      num_featured_topics: "类别页面上显示的主题数："
+      num_featured_topics: "类别页面上显示的话题数："
       subcategory_num_featured_topics: "父类别页面上的精选话题数量："
       all_topics_wiki: "默认将新话题设为 Wiki"
-      allow_unlimited_owner_edits_on_first_post: "允许所有者对话题中的第一篇帖子进行无限的编辑"
+      allow_unlimited_owner_edits_on_first_post: "允许所有者不受限制地编辑第一个帖子"
       subcategory_list_style: "子类别列表样式："
       sort_order: "话题列表排序依据："
       default_view: "默认话题列表："
@@ -2794,15 +2833,15 @@ zh_CN:
       default_list_filter: "默认列表筛选器："
       allow_badges_label: "允许在此类别中授予徽章"
       edit_permissions: "编辑权限"
-      reviewable_by_group: "除管理人员外，此类别中的内容还可以由以下群组审查："
+      reviewable_by_group: "除管理人员外，此类别中的内容还可以由以下群组审核："
       review_group_name: "群组名称"
       require_topic_approval: "所有新话题都需要版主审批"
       require_reply_approval: "所有新回复都需要版主审批"
       this_year: "今年"
       position: "类别页面上的位置："
       default_position: "默认位置"
-      position_disabled: "类别将按照活跃程度顺序显示。要控制类别在列表中的顺序，"
-      position_disabled_click: '请启用“固定类别位置”设置。'
+      position_disabled: "类别将按照活动顺序显示。要控制类别在列表中的顺序，"
+      position_disabled_click: '请启用“fixed category positions”设置。'
       minimum_required_tags: "话题中所需的最少标签数："
       parent: "父类别"
       num_auto_bump_daily: "每天自动顶贴的开放话题的数量："
@@ -2836,7 +2875,7 @@ zh_CN:
         default: "默认"
         likes: "赞"
         op_likes: "原始帖子的赞"
-        views: "浏览"
+        views: "浏览量"
         posts: "帖子"
         activity: "活动"
         posters: "发帖人"
@@ -2847,8 +2886,8 @@ zh_CN:
       subcategory_list_styles:
         rows: "行"
         rows_with_featured_topics: "有精选话题的行"
-        boxes: "方框"
-        boxes_with_featured_topics: "有推荐话题的方框"
+        boxes: "框"
+        boxes_with_featured_topics: "带精选话题的框"
       settings_sections:
         general: "常规"
         moderation: "审核"
@@ -2857,14 +2896,14 @@ zh_CN:
       list_filters:
         all: "所有话题"
         none: "无子类别"
-      colors_disabled: "您无法选择颜色，因为您的类别样式为无。"
+      colors_disabled: "您无法选择颜色，因为您的“category style”为“none”。"
     flagging:
       title: "感谢您帮助我们建设文明社区！"
       action: "举报帖子"
-      take_action: "执行操作…"
+      take_action: "采取行动…"
       take_action_options:
         default:
-          title: "执行操作"
+          title: "采取行动"
           details: "立即达到举报阈值，而不是等待更多社区举报"
         suspend:
           title: "封禁用户"
@@ -2875,7 +2914,7 @@ zh_CN:
       notify_action: "消息"
       official_warning: "官方警告"
       delete_spammer: "删除垃圾信息发布者"
-      flag_for_review: "加入审查队列"
+      flag_for_review: "加入审核队列"
       delete_confirm_MF: "您将删除此用户的 {POSTS, plural, one {<b>1</b> 个帖子} other {<b>#</b> 个帖子}}和 {TOPICS, plural, one {<b>#</b> 个话题} other {<b>#</b> 个话题}}，移除他们的帐户，阻止其 IP 地址 <b>{ip_address}</b> 再次注册，同时将其电子邮件地址 <b>{email}</b> 加入永久黑名单。确定此用户是垃圾信息发布者吗？"
       yes_delete_spammer: "是，删除垃圾信息发布者"
       ip_address_missing: "（不适用）"
@@ -2945,9 +2984,9 @@ zh_CN:
         high {，并且点赞发帖比例极高}
         other {}}
     original_post: "原始帖子"
-    views: "浏览"
+    views: "浏览量"
     views_lowercase:
-      other: "浏览"
+      other: "浏览量"
     replies: "回复"
     views_long:
       other: "此话题已被浏览 %{number} 次"
@@ -2962,12 +3001,12 @@ zh_CN:
     history: "历史记录，最近 100 次修订"
     changed_by: "作者 %{author}"
     raw_email:
-      title: "收到的电子邮件"
+      title: "传入电子邮件"
       not_available: "不可用！"
     categories_list: "类别列表"
     filters:
-      with_topics: "%{filter} 话题"
-      with_category: "%{category} 的 %{filter} 话题"
+      with_topics: "%{filter}话题"
+      with_category: "%{filter}%{category}话题"
       latest:
         title: "最新"
         title_with_count:
@@ -3028,7 +3067,7 @@ zh_CN:
         this_week: "周"
         today: "今天"
         other_periods: "查看热门："
-    browser_update: '抱歉，<a href="https://www.discourse.org/faq/#browser">您的浏览器太旧了，无法在本站点上运行</a>。请<a href="https://browsehappy.com">升级您的浏览器</a>以浏览丰富的内容，登录和回复。'
+    browser_update: '很抱歉，<a href="https://www.discourse.org/faq/#browser">您的浏览器太旧了，无法在本站点上运行</a>。请<a href="https://browsehappy.com">升级您的浏览器</a>以浏览丰富的内容，登录和回复。'
     permission_types:
       full: "创建/回复/查看"
       create_post: "回复/查看"
@@ -3041,7 +3080,7 @@ zh_CN:
       close: "关闭 (Esc)"
       content_load_error: '<a href="%url%">内容</a>无法加载。'
       image_load_error: '<a href="%url%">图片</a>无法加载。'
-    cannot_render_video: 无法渲染此视频，因为您的浏览器不支持编解码器。
+    cannot_render_video: 无法呈现此视频，因为您的浏览器不支持编解码器。
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: "，"
       shortcut_key_delimiter_plus: "+"
@@ -3080,6 +3119,7 @@ zh_CN:
         show_incoming_updated_topics: "%{shortcut} 显示更新的话题"
         search: "%{shortcut} 搜索"
         help: "%{shortcut} 打开键盘帮助"
+        dismiss_new: "%{shortcut} 关闭新话题"
         dismiss_topics: "%{shortcut} 关闭话题"
         log_out: "%{shortcut} 退出"
       composing:
@@ -3161,10 +3201,11 @@ zh_CN:
       other_tags: "其他标签"
       selector_all_tags: "所有标签"
       selector_no_tags: "无标签"
-      changed: "标签被修改："
+      changed: "标签更改："
       tags: "标签"
       choose_for_topic: "可选标签"
       info: "信息"
+      default_info: "此标签不限于任何类别，也没有同义词。要添加限制，请将此标签置于<a href=%{basePath}/tag_groups>标签组</a>中。"
       category_restricted: "此标签仅限于您无权访问的类别。"
       synonyms: "同义词"
       synonyms_description: "使用以下标签时，它们将被替换为 <b>%{base_tag_name}</b>。"
@@ -3207,10 +3248,10 @@ zh_CN:
       delete_unused_description: "删除所有未与话题或个人消息关联的标签"
       cancel_delete_unused: "取消"
       filters:
-        without_category: "%{tag} 的 %{filter} 话题"
-        with_category: "%{category}中带有 %{tag} 的 %{filter} 话题"
-        untagged_without_category: "无标签的 %{filter} 话题"
-        untagged_with_category: "%{category} 中无标签的 %{filter} 话题"
+        without_category: "%{filter}%{tag}话题"
+        with_category: "%{category}中的%{filter}%{tag}话题"
+        untagged_without_category: "无标签的%{filter}话题"
+        untagged_with_category: "%{category}中无标签的%{filter}话题"
       notifications:
         watching:
           title: "关注"
@@ -3226,12 +3267,21 @@ zh_CN:
           description: "您会在别人 @ 您或回复您的帖子时收到通知。"
         muted:
           title: "已设为免打扰"
-          description: "您不会收到有关带有此标签的新话题的任何通知，它们也不会出现在您的未读选项卡上。"
+          description: "您不会收到有关带有此标签的新话题的任何通知，它们也不会出现在您的未读标签页上。"
       groups:
         title: "标签组"
+        about_heading: "选择一个标签组或创建一个新的标签组"
+        about_heading_empty: "创建一个新的标签组以开始"
+        about_description: "标签组可帮助您在一个地方管理多个标签的权限。"
         new: "新标签组"
+        new_title: "创建新组"
+        edit_title: "编辑标签组"
+        tags_label: "此组中的标签"
+        parent_tag_label: "上级标签"
+        parent_tag_description: "只有存在上级标签时，才能使用来自此组的标签。"
         one_per_topic_label: "此组中每个话题限制一个标签"
         new_name: "新标签组"
+        name_placeholder: "名称"
         save: "保存"
         delete: "删除"
         confirm_delete: "确定要删除此标签组吗？"
@@ -3239,6 +3289,10 @@ zh_CN:
         usable_only_by_groups: "标签对所有人可见，但只有以下群组可以使用它们"
         visible_only_to_groups: "标签仅对以下群组可见"
         cannot_save: "无法保存标签组。确保至少存在一个标签，标签组名称不为空，并为标签权限选择一个组。"
+        tags_placeholder: "搜索或创建标签"
+        parent_tag_placeholder: "可选"
+        select_groups_placeholder: "选择组…"
+        disabled: "标签已被禁用。"
       topics:
         none:
           unread: "您没有未读话题。"
@@ -3281,8 +3335,10 @@ zh_CN:
         basic: "基本用户"
         member: "成员"
         regular: "活跃用户"
-        leader: "资深用户"
+        leader: "领导者"
       detailed_name: "%{level}：%{name}"
+    pick_files_button:
+      unsupported_file_picked: "您选择了不受支持的文件。支持的文件类型 – %{types}。"
   admin_js:
     type_to_filter: "输入以筛选…"
     admin:
@@ -3294,7 +3350,7 @@ zh_CN:
           only_muted: "单独或与其他已设为免打扰的标签一起使用时"
           never: "从不"
       reports:
-        title: "可用举报列表"
+        title: "可用报告列表"
       dashboard:
         title: "信息中心"
         last_updated: "信息中心更新："
@@ -3378,6 +3434,7 @@ zh_CN:
           trending_search:
             more: '<a href="%{basePath}/admin/logs/search_logs">搜索日志</a>'
             disabled: '趋势搜索报告已禁用。启用<a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">记录搜索查询</a>以收集数据。'
+          average_chart_label: 平均值
           filters:
             file_extension:
               label: 文件扩展名
@@ -3421,9 +3478,9 @@ zh_CN:
             trust_levels_title: "当用户加入时自动授予其信任级别："
             effects: 影响
             trust_levels_none: "无"
-            automatic_membership_email_domains: "使用与此列表中的电子邮件域名完全匹配的电子邮件域名注册的用户将被自动添加到此群组："
+            automatic_membership_email_domains: "使用与此列表中的电子邮件网域完全匹配的电子邮件网域注册的用户将被自动添加到此群组："
             automatic_membership_user_count:
-              other: "%{count} 个用户具有新的电子邮件域名，将被添加到群组中。"
+              other: "%{count} 个用户具有新的电子邮件网域，将被添加到群组中。"
             primary_group: "自动设置为主要群组"
         name_placeholder: "群组名称，没有空格，与用户名规则相同"
         primary: "主要群组"
@@ -3458,7 +3515,7 @@ zh_CN:
         created: 创建
         updated: 更新
         last_used: 最后使用
-        never_used: '（从未）'
+        never_used: '（从不）'
         generate: "生成"
         undo_revoke: "取消撤消"
         revoke: "撤消"
@@ -3498,17 +3555,20 @@ zh_CN:
               write: 创建一个新话题或发布到现有话题。
               read_lists: 阅读诸如热门、新、最新等话题列表。也支持 RSS。
               wordpress: WordPress wp-discussion 插件正常工作所必需。
+            posts:
+              edit: 编辑任意帖子或特定帖子。
             users:
               bookmarks: 列出用户书签。使用 ICS 格式时返回书签提醒。
-              sync_sso: 使用 DiscoursetConnect 同步用户。
+              sync_sso: 使用 DiscourseConnect 同步用户。
               show: 获取有关用户的信息。
               check_emails: 列出用户电子邮件。
               update: 更新用户个人资料信息。
               log_out: 退出用户的所有会话。
               anonymize: 对用户帐户进行匿名化处理。
               delete: 删除用户帐户。
+              list: 获取用户列表。
             email:
-              receive_emails: 将此范围与邮件收件人结合来处理传入的电子邮件。
+              receive_emails: 将此范围与邮件收件人结合来处理传入电子邮件。
       web_hooks:
         title: "网络钩子"
         none: "当前没有网络钩子。"
@@ -3562,8 +3622,8 @@ zh_CN:
           name: "标签事件"
           details: "当标签被创建、更新或销毁时。"
         reviewable_event:
-          name: "可审查的事件"
-          details: "当新条目可以进行审查及其状态更新时。"
+          name: "可审核的事件"
+          details: "当新条目可以进行审核及其状态更新时。"
         notification_event:
           name: "通知事件"
           details: "当用户在 Feed 中收到通知时。"
@@ -3719,6 +3779,7 @@ zh_CN:
           theme: "主题"
           component: "组件"
           components: "组件"
+          filter_placeholder: "输入以筛选…"
           theme_name: "主题名称"
           component_name: "组件名称"
           themes_intro: "选择现有主题或安装新主题以开始"
@@ -3826,7 +3887,7 @@ zh_CN:
             error: "此主题已被自动禁用，因为它与此版本的 Discourse 不兼容。"
             minimum: "需要 Discourse 版本 %{version} 或更高版本。"
             maximum: "需要 Discourse 版本 %{version} 或更低版本。"
-          component_of: "组件："
+          component_of: "组件所属对象："
           update_to_latest: "更新到最新"
           check_for_updates: "检查更新"
           updating: "正在更新…"
@@ -3872,7 +3933,7 @@ zh_CN:
               强烈建议为属性名称添加前缀以避免与插件和/或核心冲突。
           head_tag:
             text: "</head>"
-            title: "将在 </head> 标签前插入的 HTML"
+            title: "将在 </head> 标记前插入的 HTML"
           body_tag:
             text: "</body>"
             title: "将在 </body> 标记前插入的 HTML"
@@ -3890,7 +3951,7 @@ zh_CN:
           long_title: "调色板"
           about: "修改您的主题使用的颜色。创建一个新的调色板以开始。"
           new_name: "新调色板"
-          copy_name_prefix: "复制于"
+          copy_name_prefix: "副本 -"
           delete_confirm: "删除此调色板？"
           undo: "撤消"
           undo_title: "撤消自上次保存以来对此颜色所做的变更。"
@@ -3937,8 +3998,8 @@ zh_CN:
             name: "爱"
             description: "点赞按钮的颜色。"
         robots:
-          title: "覆盖您的站点 robots.txt 文件："
-          warning: "这将永久覆盖任何相关的站点设置。"
+          title: "替换您的站点的 robots.txt 文件："
+          warning: "这将永久替换任何相关的站点设置。"
           overridden: 您的站点的默认 robots.txt 文件已被覆盖。
         email_style:
           title: "电子邮件样式"
@@ -3989,7 +4050,7 @@ zh_CN:
         html_preview: "电子邮件内容预览"
         last_seen_user: "最后活动："
         no_result: "没有找到摘要的结果。"
-        reply_key: "回复关键字"
+        reply_key: "回复键"
         skipped_reason: "跳过原因"
         incoming_emails:
           from_address: "发件人"
@@ -3997,9 +4058,9 @@ zh_CN:
           cc_addresses: "抄送"
           subject: "主题"
           error: "错误"
-          none: "未找到收到的电子邮件。"
+          none: "未找到传入电子邮件。"
           modal:
-            title: "收到的电子邮件详细信息"
+            title: "传入电子邮件详细信息"
             error: "错误"
             headers: "标头"
             subject: "主题"
@@ -4020,7 +4081,7 @@ zh_CN:
             type_placeholder: "摘要、注册…"
             reply_key_placeholder: "回复键"
       moderation_history:
-        performed_by: "执行者"
+        performed_by: "执行人"
         no_results: "没有可用的审核历史记录。"
         actions:
           delete_user: "已删除用户"
@@ -4046,7 +4107,7 @@ zh_CN:
           block: "禁止"
           do_nothing: "无操作"
         staff_actions:
-          all: "全部"
+          all: "所有"
           filter: "筛选："
           title: "管理人员操作"
           clear_filters: "显示一切"
@@ -4071,9 +4132,9 @@ zh_CN:
             delete_theme: "删除主题"
             change_site_text: "更改站点文本"
             suspend_user: "封禁用户"
-            unsuspend_user: "解禁用户"
+            unsuspend_user: "取消封禁用户"
             removed_suspend_user: "封禁用户（已移除）"
-            removed_unsuspend_user: "解禁用户（已移除）"
+            removed_unsuspend_user: "取消封禁用户（已移除）"
             grant_badge: "授予徽章"
             revoke_badge: "撤消徽章"
             check_email: "检查电子邮件"
@@ -4106,7 +4167,7 @@ zh_CN:
             change_readonly_mode: "更改只读模式"
             backup_download: "下载备份"
             backup_destroy: "销毁备份"
-            reviewed_post: "已审查的帖子"
+            reviewed_post: "已审核的帖子"
             custom_staff: "插件自定义操作"
             post_locked: "已锁定帖子"
             post_edit: "帖子编辑"
@@ -4139,7 +4200,7 @@ zh_CN:
             api_key_create: "创建 API 密钥"
             api_key_update: "更新 API 密钥"
             api_key_destroy: "销毁 API 密钥"
-            override_upload_secure_status: "覆盖上传安全状态"
+            override_upload_secure_status: "替换上传安全状态"
             page_published: "已发布页面"
             page_unpublished: "已取消发布页面"
             add_email: "添加电子邮件"
@@ -4152,6 +4213,8 @@ zh_CN:
             post_staff_note_create: "添加管理人员注释"
             post_staff_note_destroy: "删除管理人员注释"
             delete_group: "删除群组"
+            watched_word_create: "添加关注词"
+            watched_word_destroy: "删除关注词"
         screened_emails:
           title: "已屏蔽的电子邮件"
           description: "当有人尝试创建新帐户时，将检查以下电子邮件地址并禁止注册，或执行某些其他操作。"
@@ -4162,7 +4225,7 @@ zh_CN:
           title: "已屏蔽的 URL"
           description: "此处列出的 URL 曾被识别为垃圾信息发布者的用户在帖子中使用。"
           url: "URL"
-          domain: "域名"
+          domain: "网域"
         screened_ips:
           title: "已屏蔽的 IP"
           description: '正在监视的 IP 地址。使用 “允许”以将 IP 地址列入许可名单。'
@@ -4200,11 +4263,12 @@ zh_CN:
         search: "搜索"
         clear_filter: "清除"
         show_words:
-          other: "显示 %{count} 个单词"
+          other: "显示 %{count} 个字词"
         download: 下载
         clear_all: 全部清除
         clear_all_confirm: "确定要清除%{action}操作的所有关注词吗？"
         invalid_regex: '关注词“%{word}”是无效的正则表达式。'
+        regex_warning: '<a href="%{basePath}/admin/site_settings/category/all_results?filter=watched%20words%20regular%20expressions%20">关注词是正则表达式</a>，它们不会自动包含词边界。如果您希望正则表达式匹配整个词，请在正则表达式的开头和结尾包含 <code>\b</code>'
         actions:
           block: "禁止"
           censor: "审查"
@@ -4215,17 +4279,17 @@ zh_CN:
           silence: "禁言"
           link: "链接"
         action_descriptions:
-          block: "防止发布包含这些单词的帖子。用户在尝试提交帖子时会看到一条错误消息。"
-          censor: "允许包含这些单词的帖子，但将其替换为隐藏审查词的字符。"
-          require_approval: "包含这些单词的帖子需通过人工批准才能被看到。"
-          flag: "允许包含这些单词的帖子，但将其举报为不当，以便版主对其进行审查。"
-          replace: "使用其他单词替换帖子中的单词"
+          block: "禁止发布包含这些字词的帖子。用户在尝试提交帖子时会看到一条错误消息。"
+          censor: "允许包含这些字词的帖子，但将其替换为隐藏敏感词的字符。"
+          require_approval: "包含这些字词的帖子需通过人工批准才能被看到。"
+          flag: "允许包含这些字词的帖子，但将其举报为不当，以便版主对其进行审核。"
+          replace: "使用其他字词替换帖子中的字词"
           tag: "根据第一个帖子自动为话题添加标签"
-          silence: "用户包含这些单词的首个帖子需要工作人员批准才能被看到，该用户将被自动禁言。"
-          link: "使用链接替换帖子中的单词"
+          silence: "用户包含这些字词的第一个帖子需要工作人员批准才能被看到，该用户将被自动禁言。"
+          link: "使用链接替换帖子中的字词"
         form:
-          label: "包含单词或短语"
-          placeholder: "包含单词或短语（* 为通配符）"
+          label: "包含字词或短语"
+          placeholder: "包含字词或短语（* 为通配符）"
           placeholder_regexp: "正则表达式"
           replace_label: "替换"
           replace_placeholder: "示例"
@@ -4239,7 +4303,8 @@ zh_CN:
           upload_successful: "上传成功。关注词已添加。"
         test:
           button_label: "测试"
-          description: "在下方输入文本以检查有无与敏感词的匹配"
+          modal_title: "%{action}：测试关注词"
+          description: "在下方输入文本以检查有无与关注词的匹配"
           found_matches: "找到匹配："
           no_matches: "未找到匹配项"
       impersonate:
@@ -4260,19 +4325,19 @@ zh_CN:
           new: "新"
           active: "活跃"
           staff: "管理人员"
-          suspended: "已封禁"
-          silenced: "已禁言"
+          suspended: "被封禁"
+          silenced: "被禁言"
           staged: "暂存"
         approved: "已批准？"
         titles:
           active: "活跃用户"
           new: "新用户"
-          pending: "等待审查的用户"
+          pending: "等待审核的用户"
           newuser: "信任级别为 0 的用户（新用户）"
           basic: "信任级别为 1 的用户（基本用户）"
           member: "信任级别为 2 的用户（成员）"
           regular: "信任级别为 3 的用户（活跃）"
-          leader: "信任级别为 4 的用户（资深）"
+          leader: "信任级别为 4 的用户（领导者）"
           staff: "管理人员"
           admins: "管理员用户"
           moderators: "版主"
@@ -4323,10 +4388,11 @@ zh_CN:
         penalty_post_edit: "编辑帖子"
         penalty_post_none: "无操作"
         penalty_count: "处罚计数"
+        penalty_history: "处罚历史记录"
         clear_penalty_history:
           title: "清除处罚历史记录"
           description: "有处罚的用户无法达到信任级别 3"
-        delete_all_posts_confirm_MF: "你将删除 {POSTS, plural, one {1 个帖子} other {# 个帖子}}和 {TOPICS, plural, one {1 个话题} other {# 个话题}}。确定吗？"
+        delete_all_posts_confirm_MF: "您将删除 {POSTS, plural, one {1 个帖子} other {# 个帖子}}和 {TOPICS, plural, one {1 个话题} other {# 个话题}}。确定吗？"
         silence: "禁言"
         unsilence: "取消禁言"
         silenced: "已禁言？"
@@ -4364,10 +4430,12 @@ zh_CN:
         flags_given_count: 提交的举报
         flags_received_count: 收到的举报
         warnings_received_count: 收到的警告
+        warnings_list_warning: |
+          作为版主，您可能无法查看所有这些话题。如有必要，请向管理员或发布版主请求对该消息的<b>版主</b>访问权限。
         flags_given_received_count: "提交的举报/收到的举报"
         approve: "批准"
-        approved_by: "批准者"
-        approve_success: "用户已被批准， 包含激活说明的电子邮件已发送。"
+        approved_by: "批准人"
+        approve_success: "用户已被批准，包含激活说明的电子邮件已发送。"
         approve_bulk_success: "成功！所有选定用户已被批准并通知。"
         time_read: "阅读时间"
         anonymize: "对用户进行匿名化处理"
@@ -4411,7 +4479,7 @@ zh_CN:
         cant_delete_all_posts:
           other: "无法删除所有帖子。某些帖子的存在时间超过 %{count} 天。（delete_user_max_post_age 设置。）"
         cant_delete_all_too_many_posts:
-          other: "无法删除所有帖子，因为该用户的帖子超过 %{count} 个。(delete_all_posts_max)"
+          other: "无法删除所有帖子，因为该用户的帖子超过 %{count} 篇。(delete_all_posts_max)"
         delete_confirm: "一般而言，最好对用户进行匿名化而不是删除它们，以避免移除现有讨论中的内容。<br><br>确定要删除此用户吗？此操作无法撤消！"
         delete_and_block: "删除并<b>禁止</b>该电子邮件和 IP 地址"
         delete_dont_block: "仅删除"
@@ -4451,6 +4519,9 @@ zh_CN:
         trust_level_unlocked_tip: "信任级别已被解锁，系统可能会升降用户的信任级别"
         lock_trust_level: "锁定信任级别"
         unlock_trust_level: "解锁信任级别"
+        silenced_count: "被禁言"
+        suspended_count: "被封禁"
+        last_six_months: "过去 6 个月"
         tl3_requirements:
           title: "信任级别 3 的要求"
           table_title:
@@ -4527,6 +4598,7 @@ zh_CN:
           text: "文本字段"
           confirm: "确认"
           dropdown: "下拉菜单"
+          multiselect: "多选"
       site_text:
         description: "您可以自定义论坛上的任何文本。请从在下面搜索开始："
         search: "搜索您要编辑的文本"
@@ -4536,12 +4608,12 @@ zh_CN:
         revert_confirm: "确定要还原您的变更吗？"
         go_back: "返回搜索"
         recommended: "我们建议自定义以下文本以符合您的需求："
-        show_overriden: "只显示被覆盖"
+        show_overriden: "只显示被替换"
         locale: "语言："
-        fallback_locale_warning: "您正在基于 %{fallback}编辑语言。选择 %{fallback} 作为界面语言的用户将看不到你的更改。"
+        fallback_locale_warning: "您正在编辑基于%{fallback}的语言。选择%{fallback}作为界面语言的用户不会看到您的变更。"
         more_than_50_results: "结果超过 50 个。请优化您的搜索。"
       settings:
-        show_overriden: "只显示被覆盖"
+        show_overriden: "只显示被替换"
         history: "查看变更历史记录"
         reset: "重置"
         none: "无"
@@ -4618,7 +4690,7 @@ zh_CN:
         badge_grouping: 组
         badge_groupings:
           modal_title: 徽章组
-        granted_by: 授予者
+        granted_by: 授予人
         granted_at: 授予时间
         reason_help: '（帖子或话题的链接）'
         save: 保存
@@ -4643,7 +4715,7 @@ zh_CN:
         image: 图片
         graphic: 图形
         icon_help: "输入一个 Font Awsome 图标名称（使用前缀“far-”表示常规图标，使用前缀“fab-”表示品牌图标）"
-        image_help: "如果两者都设置，则上传图像会覆盖图标字段。"
+        image_help: "如果两者都设置，则上传图像会替换图标字段。"
         select_an_icon: "选择一个图标"
         upload_an_image: "上传图片"
         read_only_setting_help: "自定义文本"
@@ -4689,8 +4761,11 @@ zh_CN:
           perform: "向用户授予徽章"
           upload_csv: 上传包含用户电子邮件或用户名的 CSV
           aborted: 请上传包含用户电子邮件或用户名的 CSV
-          success: 您的 CSV 已收到，用户很快就会收到他们的徽章。
+          success: 您的 CSV 已收到，%{count} 个用户很快就会收到他们的徽章。
+          csv_has_unmatched_users: "以下条目位于 CSV 文件中，但它们无法与现有用户匹配，因此不会收到徽章："
+          csv_has_unmatched_users_truncated_list: "CSV 文件中有 %{count} 个条目无法与现有用户匹配，因此不会收到徽章。由于存在大量不匹配的条目，因此仅显示前 100 个条目："
           replace_owners: 将徽章从以前的所有者移除
+          grant_existing_holders: 向现有徽章持有者授予额外的徽章
       emoji:
         title: "表情符号"
         help: "添加可供所有人使用的新表情符号。（高级提示：一次拖放多个文件）"
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index 265eb30916..5e453fcd25 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -183,7 +183,6 @@ zh_TW:
     conduct: "行為準則"
     mobile_view: "手機版"
     desktop_view: "電腦版"
-    you: "你"
     or: "或"
     now: "就在剛才"
     read_more: "閱讀更多"
@@ -246,7 +245,6 @@ zh_TW:
       resume: "恢復"
       remove: "移除"
       new_topic: "新話題草稿"
-      new_private_message: "新私訊草稿"
       topic_reply: "回覆草稿"
       abandon:
         yes_value: "捨棄"
@@ -551,8 +549,6 @@ zh_TW:
         public: "公開"
         private: "私密"
         public_groups: "公開群組"
-        automatic_group: 自動群組
-        close_group: 不公開的群組
         my_groups: "我的群組"
         group_type: "群組類型"
         is_group_user: "成員"
@@ -607,6 +603,8 @@ zh_TW:
       flair_color_placeholder: "（可選）十六進制色彩值"
       flair_preview_icon: "預覽圖示"
       flair_preview_image: "預覽圖片"
+      default_notifications:
+        modal_yes: "是"
     user_action_groups:
       "1": "已按讚"
       "2": "已收到讚"
@@ -636,7 +634,6 @@ zh_TW:
       posts: "貼文"
       topics: "話題"
       latest: "最新"
-      toggle_ordering: "顯示/隱藏排序控制"
       subcategories: "次分類"
       topic_sentence:
         other: "%{count} 個話題"
@@ -947,7 +944,6 @@ zh_TW:
         secure_account: "增強我的帳號安全性"
         latest_post: "最近的貼文…"
       last_posted: "最近發表"
-      last_emailed: "最近寄出電子郵件"
       last_seen: "出現時間"
       created: "建立日期"
       log_out: "登出"
@@ -2019,8 +2015,6 @@ zh_TW:
       whisper: "這貼文是版主私人密談"
       wiki:
         about: "這篇貼文是共筆"
-      archetypes:
-        save: "儲存選項"
       few_likes_left: "謝謝你的熱情！你今天的讚快用完了。"
       controls:
         reply: "開始編寫對此貼文的回覆"
@@ -2113,12 +2107,12 @@ zh_TW:
         edit: "編輯書籤"
         created: "已建立"
         name: "名稱"
+        options: "選項"
         actions:
           edit_bookmark:
             name: "編輯書籤"
             description: "編輯書籤名稱或更改提醒日期和時間"
     category:
-      can: "可以&hellip; "
       none: "( 無分類 )"
       all: "所有分類"
       choose: "選擇一個分類&hellip;"
@@ -2145,7 +2139,6 @@ zh_TW:
       save_error: 儲存分類時發生錯誤。
       name: "分類名稱"
       description: "描述"
-      topic: "分類話題"
       logo: "分類圖示"
       background_image: "分類背景圖片"
       badge_colors: "識別顏色"
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index cd47f7aa98..5615fbe3b2 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -46,9 +46,9 @@ ar:
   log_in: "تسجيل الدخول"
   submit: "إرسال"
   purge_reason: "تم حذفه تلقائيًا باعتباره حسابًا تم تجاهله أو غير مفعَّل"
-  disable_remote_images_download_reason: "تم تعطيل تنزيل الصور عن بُعد بسبب عدم توفُّر مساحة كافية على القرص."
+  disable_remote_images_download_reason: "تم إيقاف تنزيل الصور عن بُعد بسبب عدم توفُّر مساحة كافية على القرص."
   anonymous: "مجهول"
-  remove_posts_deleted_by_author: "تم الحذف بواسطة الكاتب"
+  remove_posts_deleted_by_author: "تم الحذف بواسطة المؤلف"
   redirect_warning: "تعذَّر علينا التحقُّق من نشر الرابط الذي حدَّدته في المنتدى. إذا كنت تريد المتابعة على أي حال، فحدِّد الرابط أدناه."
   on_another_topic: "في موضوع آخر"
   inline_oneboxer:
@@ -173,8 +173,8 @@ ar:
       load_from_remote: "حدث خطأ في أثناء تحميل هذا المنشور."
     site_settings:
       invalid_category_id: "الفئة التي حدَّدتها غير موجودة"
-      default_categories_already_selected: "لا يمكنك اختيار فئة مُستخدَمة في قائمة أخرى."
-      default_tags_already_selected: "لا يمكنك اختيار وسم مُستخدَم في قائمة أخرى."
+      default_categories_already_selected: "لا يمكنك تحديد فئة مُستخدَمة في قائمة أخرى."
+      default_tags_already_selected: "لا يمكنك تحديد وسم مُستخدَم في قائمة أخرى."
       s3_upload_bucket_is_required: "لا يمكنك تفعيل التحميلات إلى S3 قبل تقديم 's3_upload_bucket'."
       s3_backup_requires_s3_settings: "لا يمكنك استخدام S3 كمكان للنسخ الاحتياطي ما لم تُدخِل \"%{setting_name}\"."
       s3_bucket_reused: "لا يمكنك استخدام الحاوية نفسها لـ \"s3_upload_bucket\" و\"s3_backup_bucket\" معًا. اختر حاويةً أخرى أو استخدم مسارًا مختلفًا لكل حاوية."
@@ -195,7 +195,7 @@ ar:
   not_logged_in: "عليك تسجيل الدخول لإجراء ذلك."
   not_found: "تعذَّر العثور على عنوان URL أو المورد المطلوب."
   invalid_access: "غير مسموح لك بعرض المورد المطلوب."
-  read_only_mode_enabled: "الموقع في وضع القراءة فقط. والتفاعلات معطَّلة."
+  read_only_mode_enabled: "الموقع في وضع القراءة فقط. والتفاعلات متوقفة."
   not_in_group:
     join_group: "الانضمام إلى المجموعة"
   reading_time: "وقت القراءة"
@@ -329,7 +329,7 @@ ar:
       everyone: "الجميع"
       admins: "المسؤولون"
       moderators: "المشرفون"
-      staff: "طاقم العمل"
+      staff: "فريق العمل"
       trust_level_0: "trust_level_0"
       trust_level_1: "trust_level_1"
       trust_level_2: "trust_level_2"
@@ -387,7 +387,7 @@ ar:
             base:
               too_many_users: "يمكنك إرسال التحذيرات إلى مستخدم واحد فقط في الوقت نفسه."
               no_user_selected: "يجب عليك تحديد مستخدم صالح."
-              reply_by_email_disabled: "تم تعطيل الرد عبر البريد الإلكتروني."
+              reply_by_email_disabled: "تم إيقاف الرد عبر البريد الإلكتروني."
             featured_link:
               invalid_category: "لا يمكن التعديل في هذه الفئة."
         user:
@@ -415,8 +415,8 @@ ar:
   vip_category_description: "فئة حصرية للأعضاء من مستوى الثقة 3 وأعلى."
   meta_category_name: "التعليقات على الموقع"
   meta_category_description: "مناقشة حول هذا الموقع، ومؤسسته، وطريقة عمله، وكيف يمكننا تحسينه."
-  staff_category_name: "طاقم العمل"
-  staff_category_description: "فئة خاصة لمناقشات طاقم العمل. تكون الموضوعات مرئية للمسؤولين والمشرفين فقط."
+  staff_category_name: "فريق العمل"
+  staff_category_description: "فئة خاصة لمناقشات فريق العمل. تكون الموضوعات مرئية للمسؤولين والمشرفين فقط."
   discourse_welcome_topic:
     title: "مرحبًا بك في Discourse"
   lounge_welcome:
@@ -438,7 +438,7 @@ ar:
     uncategorized_description: "الموضوعات التي لا تحتاج إلي فئة أو لا تندرج تحت أي فئة أخرى."
   trust_levels:
     admin: "المسؤول"
-    staff: "طاقم العمل"
+    staff: "فريق العمل"
     change_failed_explanation: "لقد حاولت خفض رتبة %{user_name} إلى '%{new_trust_level}'، لكن مستوى الثقة لديه حاليًا هو '%{current_trust_level}'. سيظل %{user_name} عند مستوى الثقة '%{current_trust_level}' - إذا كنت ترغب في خفض رتبة المستخدم، فاقفل مستوى الثقة أولًا."
   rate_limiter:
     hours:
@@ -621,7 +621,7 @@ ar:
     choose: "اختيار كلمة مرور"
     update: "تحديث كلمة المرور"
     save: "ضبط كلمة المرور"
-    title: "إعادة تعيين كلمة المرور"
+    title: "إعادة ضبط كلمة المرور"
     success: "لقد غيَّرت كلمة مرورك وسجَّلت الدخول بنجاح."
     success_unapproved: "لقد غيَّرت كلمة مرورك بنجاح."
   user_auth_tokens:
@@ -690,8 +690,8 @@ ar:
       email_body: "%{link}\n\n%{message}"
     notify_moderators:
       title: "سبب آخر"
-      description: "يستدعي هذا المنشور انتباه طاقم العمل لسبب آخر لم يتم ذكره أعلاه."
-      email_title: 'يستدعي منشور في "%{title}" انتباه طاقم العمل'
+      description: "يستدعي هذا المنشور انتباه فريق العمل لسبب آخر لم يتم ذكره أعلاه."
+      email_title: 'يستدعي منشور في "%{title}" انتباه فريق العمل'
       email_body: "%{link}\n\n%{message}"
     bookmark:
       title: "إشارة مرجعية"
@@ -766,7 +766,7 @@ ar:
       logging_in_as: تسجيل الدخول باسم %{username}
       confirm_button: إنهاء تسجيل الدخول
     no_trust_level: "عذرًا، ليس لديك مستوى الثقة المطلوب للوصول إلى API للمستخدم"
-    generic_error: "عذرًا، لا يمكننا إصدار مفاتيح API للمستخدمين؛ ربما يكون مسؤول الموقع قد عطَّل هذه الميزة"
+    generic_error: "عذرًا، لا يمكننا إصدار مفاتيح API للمستخدمين؛ ربما يكون مسؤول الموقع قد أوقف هذه الميزة"
     scopes:
       message_bus: "التحديثات المباشرة"
       notifications: "قراءة الإشعارات ومسحها"
@@ -1010,8 +1010,8 @@ ar:
     download_remote_images_threshold: "الحد الأدنى من مساحة القرص اللازمة لتنزيل الصور البعيدة محليًا (بالنسبة المئوية)"
     disabled_image_download_domains: "لن يتم تنزيل الصور البعيدة من هذه النطاقات أبدًا. قائمة مفصولة بشرائط عمودية."
     editing_grace_period: "لن يؤدي التعديل إلى إنشاء نسخة جديدة في سجل المنشورات لمدة (n) ثانية بعد النشر."
-    edit_history_visible_to_public: "السماح للجميع برؤية النسخ السابقة من المنشورات التي تم تعديلها. عند تعطيل هذا الإعداد، سيتمكن أعضاء الطاقم فقط من رؤيتها."
-    delete_removed_posts_after: "سيتم حذف المنشورات التي أزالها الكاتب بعد (n) ساعة. في حال الضبط على 0، سيتم حذف المنشورات على الفور."
+    edit_history_visible_to_public: "السماح للجميع برؤية النسخ السابقة من المنشورات التي تم تعديلها. عند إيقاف هذا الإعداد، سيتمكن أعضاء الفريق فقط من رؤيتها."
+    delete_removed_posts_after: "سيتم حذف المنشورات التي أزالها المؤلف بعد (n) ساعة. في حال الضبط على 0، سيتم حذف المنشورات على الفور."
     max_image_width: "أقصى عرض للصور المصغَّرة في المنشور"
     max_image_height: "أقصى ارتفاع للصور المصغَّرة في المنشور"
     fixed_category_positions: "في حال تحديده، ستتمكن من ترتيب الفئات ترتيبًا ثابتًا. وإذا ألغيت تحديده، فسيتم إدراج الفئات بترتيب النشاط."
@@ -1028,13 +1028,13 @@ ar:
     force_https: "فرض استخدام HTTPS فقط على الموقع. تحذير: لا تفعِّل هذا الإعداد إلا بعد التأكد من أن HTTPS مُعد بالكامل ويعمل فى جميع أنحاء الموقع! هل تحقَّقت من شبكة توصيل المحتوى (CDN)، وعمليات تسجيل الدخول على جميع شبكات التواصل الاجتماعى، وأي شعارات أو تبعيات خارجية للتأكد من أنها جميعًا متوافقه مع HTTPS؟"
     summary_score_threshold: "الحد الأدنى من النقاط المطلوبة لتضمين منشور في \"تلخيص هذا الموضوع\""
     summary_percent_filter: "يظهر أعلى % من المنشورات عندما يضغط المستخدم على \"تلخيص هذا الموضوع\""
-    enable_long_polling: "يمكن لناقل الرسائل المُستخدَم في الإشعارات استخدام الاتصال الطويل"
-    long_polling_base_url: "عنوان URL الأساسي المُستخدَم في الاتصال الطويل (عندما تخدم شبكة توصيل المحتوى (CDN) محتوًى ديناميكيًا، احرص على ضبط هذا على سحب الموارد من المصدر) eg: http://origin.site.com"
+    enable_long_polling: "يمكن لناقل الرسائل المُستخدَم في الإشعارات استخدام الاستقصاء الطويل"
+    long_polling_base_url: "عنوان URL الأساسي المُستخدَم في الاستقصاء الطويل (عندما تخدم شبكة توصيل المحتوى (CDN) محتوًى ديناميكيًا، احرص على ضبط هذا على سحب الموارد من المصدر) eg: http://origin.site.com"
     long_polling_interval: "المدة الزمنية التي سينتظرها الخادم قبل الرد على العملاء عند عدم وجود أي بيانات لإرسالها (للأعضاء الذين سجَّلوا الدخول فقط)"
-    polling_interval: "المدة الزمنية المفترض أن يظل العملاء الذين سجَّلوا الدخول متصلين خلالها بالمللي ثانية عندما لا يكون الاتصال الطويل مستخدمًا"
-    anon_polling_interval: "المدة الزمنية المفترض أن يظل العملاء المجهولين متصلين خلالها بالمللي ثانية"
-    background_polling_interval: "المدة الزمنية المفترض أن يظل العملاء متصلين خلالها بالمللي ثانية (عندما تكون النافذة في الخلفية)"
-    cooldown_minutes_after_hiding_posts: "عدد الدقائق التي يجب على المستخدم انتظارها قبل أن يتمكَّن من تعديل منشور مخفي بسبب بلاغات المجتمع"
+    polling_interval: "المدة الزمنية المفترض أن يظل العملاء الذين سجَّلوا الدخول متصلين خلالها بالمللي ثانية عندما لا يكون الاستقصاء الطويل مستخدمًا"
+    anon_polling_interval: "المدة الزمنية المفترض استقصاء العملاء المجهولين خلالها بالمللي ثانية"
+    background_polling_interval: "المدة الزمنية المفترض استقصاء العملاء المجهولين خلالها بالمللي ثانية (عندما تكون النافذة في الخلفية)"
+    cooldown_minutes_after_hiding_posts: "عدد الدقائق التي يجب على المستخدم انتظارها قبل أن يتمكن من تعديل منشور مخفي بسبب بلاغات المجتمع"
     max_topics_in_first_day: "أقصى عدد من الموضوعات المسموح للمستخدم إنشاؤها خلال 24 ساعة من إنشاء أول منشور."
     max_replies_in_first_day: "أقصى عدد من الردود المسموح للمستخدم إنشاؤها خلال 24 ساعة قبل إنشاء منشوره الأول"
     tl2_additional_likes_per_day_multiplier: "زيادة حد الإعجابات اليومي لمستوى الثقة 2 (عضو) عن طريق مضاعفة هذا الرقم"
@@ -1049,7 +1049,7 @@ ar:
     post_menu: "تحديد العناصر التي تظهر في قائمة المنشور وترتيبها. مثال: تعديل|إبلاغ|حذف|مشاركة|إشارة مرجعية|رد"
     post_menu_hidden_items: "عناصر القائمة التي سيتم إخفاؤها افتراضيًا في قائمة المنشور ما لم يتم النقر على رمز الثلاث نقاط لتوسيع القائمة."
     share_links: "تحديد العناصر التي تظهر في مربع حوار المشاركة وترتيبها"
-    site_contact_username: "اسم مستخدم صالح لطاقم العمل لإرسال جميع الرسائل الآلية منه. سيتم استخدام حساب النظام الافتراضي في حال تركها خالية."
+    site_contact_username: "اسم مستخدم صالح لفريق العمل لإرسال جميع الرسائل الآلية منه. سيتم استخدام حساب النظام الافتراضي في حال تركها خالية."
     send_welcome_message: "إرسال رسالة ترحيبية إلى جميع المستخدمين الجُدد مع دليل البدء السريع"
     suppress_reply_directly_below: "عدم عرض عدد الردود القابل للتوسيع على منشور عندما يكون هناك رد واحد فقط أسفل هذا المنشور مباشرةً."
     suppress_reply_directly_above: "عدم عرض عبارة \"ردًا على\" القابلة للتوسيع في منشور عندما يكون هناك رد واحد فقط فوق هذا المنشور مباشرةً."
@@ -1061,14 +1061,14 @@ ar:
     top_page_default_timeframe: "الإطار الزمني الافتراضي لصفحة العرض من الأعلى."
     email_token_valid_hours: "نسيت كلمة المرور/الرموز المميزة لتفعيل الحساب صالحة لمدة (n) ساعة."
     enable_badges: "تفعيل نظام الشارات"
-    enable_whispers: "السماح بالاتصالات الخاصة بين طاقم العمل داخل الموضوعات."
+    enable_whispers: "السماح بالاتصالات الخاصة بين فريق العمل داخل الموضوعات."
     blocked_email_domains: "قائمة مفصولة بشرائط عمودية لنطاقات البريد الإلكتروني التي لا يتم السماح للمستخدمين بتسجيل حسابات عليها. مثال: mailinator.com|trashmail.net"
     allowed_email_domains: "قائمة مفصولة بشرائط عمودية لنطاقات البريد الإلكتروني التي يجب على المستخدمين تسجيل حسابات عليها. تحذير: لن يتم السماح بالمستخدمين المسجَّلين على نطاقات بريد إلكتروني أخرى بخلاف المذكورة هنا!"
     hide_email_address_taken: "لا تُخبر المستخدمين بوجود حساب بعنوان البريد الإلكتروني نفسه في أثناء الاشتراك وفي نموذج نسيان كلمة المرور."
     log_out_strict: "تسجيل خروج المستخدم من جميع الجلسات على جميع الأجهزة عند تسجيل الخروج"
     new_version_emails: "إرسال رسالة إلكترونية إلى عنوان contact_email عند توفُّر إصدار جديد من Discourse"
     invite_expiry_days: "مدة صلاحية مفاتيح دعوة المستخدمين بالأيام"
-    invite_only: "يجب أن تتم دعوة جميع المستخدمين الجُدد بشكلٍ صريح بواسطة المستخدمين الموثوق بهم أو طاقم العمل. التسجيل العام معطَّل."
+    invite_only: "يجب أن تتم دعوة جميع المستخدمين الجُدد بشكلٍ صريح بواسطة المستخدمين الموثوق بهم أو فريق العمل. التسجيل العام متوقف."
     login_required: "طلب المصادقة لقراءة المحتوى على هذا الموقع، وعدم السماح بالوصول المجهول"
     min_username_length: "الحد الأدنى لطول اسم المستخدم بالأحرف. تحذير: إذا كان لدى أي مستخدمين أو مجموعات حالية أسماء أقصر من ذلك، فسيتعطَّل موقعك!"
     min_password_length: "الحد الأدنى لطول كلمة المرور."
@@ -1083,7 +1083,7 @@ ar:
     automatic_backups_enabled: "تشغيل النسخ الاحتياطية التلقائية كما هو محدَّد في تردد النسخ الاحتياطي"
     s3_backup_bucket: "الحاوية البعيدة للاحتفاظ بالنسخ الاحتياطية. تحذير: تأكد من أنها حاوية خاصة."
     backup_time_of_day: "الوقت من اليوم (بالتوقيت العالمي الموحَّد) الذي يجب أن يتم فيه النسخ الاحتياطي"
-    backup_with_uploads: "تضمين عمليات التحميل في النسخ الاحتياطية المجدولة. سيؤدي تعطيل هذا الإعداد إلى نسخ قاعدة البيانات احتياطيًا فقط."
+    backup_with_uploads: "تضمين عمليات التحميل في النسخ الاحتياطية المجدولة. سيؤدي إيقاف هذا الإعداد إلى نسخ قاعدة البيانات احتياطيًا فقط."
     active_user_rate_limit_secs: "عدد مرات تحديث حقل \"last_seen_at\" بالثواني"
     verbose_localization: "عرض نصائح موسَّعة بشأن الترجمة في واجهة المستخدم"
     previous_visit_timeout_hours: "مدة الزيارة قبل أن نعتبرها الزيارة \"السابقة\"، بالساعات"
@@ -1153,16 +1153,16 @@ ar:
     authorized_extensions: "قائمة بامتدادات الملفات المسموح بتحميلها (استخدم \"*\" للسماح بجميع أنواع الملفات)"
     max_similar_results: "عدد الموضوعات المشابهة التي يجب إظهارها فوق المحرِّر عند إنشاء موضوع جديد. تستند المقارنة إلى العنوان والنص."
     title_prettify: "منع الأخطاء الإملائية والأخطاء الشائعة في العناوين، بما في ذلك الكتابة بأحرف كبيرة أو كتابة الأحرف الاستهلالية للكلمات بأحرف صغيرة أو تكرار ! و؟، أو وضع . إضافية في النهاية، إلى آخره."
-    topic_views_heat_low: "يتم تمييز حقل مرات العرض قليلًا بعد هذا العدد من مرات العرض."
+    topic_views_heat_low: "يتم تمييز حقل مرات العرض بشكلٍ طفيف بعد هذا العدد من مرات العرض."
     topic_views_heat_medium: "يتم تمييز حقل مرات العرض بشكلٍ متوسط بعد هذا العدد من مرات العرض."
     topic_views_heat_high: "يتم تمييز حقل مرات العرض بقوة بعد هذا العدد من مرات العرض."
-    cold_age_days_low: "يتم تعتيم تاريخ آخر نشاط قليلًا بعد هذا العدد من أيام المحادثة."
+    cold_age_days_low: "يتم تعتيم تاريخ آخر نشاط بشكلٍ طفيف بعد هذا العدد من أيام المحادثة."
     cold_age_days_medium: "يتم تعتيم تاريخ آخر نشاط بشكلٍ متوسط بعد هذا العدد من أيام المحادثة."
     cold_age_days_high: "يتم تعتيم تاريخ آخر نشاط بقوة بعد هذا العدد من أيام المحادثة."
-    history_hours_low: "يتم تمييز مؤشر التعديل قليلًا عند تعديل منشور خلال هذا العدد من الساعات."
+    history_hours_low: "يتم تمييز مؤشر التعديل بشكلٍ طفيف عند تعديل منشور خلال هذا العدد من الساعات."
     history_hours_medium: "يتم تمييز مؤشر التعديل بشكلٍ متوسط عند تعديل منشور خلال هذا العدد من الساعات."
     history_hours_high: "يتم تمييز مؤشر التعديل بقوة عند تعديل منشور خلال هذا العدد من الساعات."
-    topic_post_like_heat_low: "يتم تمييز حقل عدد المنشورات قليلًا بعد تجاوز معدل الإعجابات:المنشور هذه النسبة."
+    topic_post_like_heat_low: "يتم تمييز حقل عدد المنشورات بشكلٍ طفيف بعد تجاوز معدل الإعجابات:المنشور هذه النسبة."
     topic_post_like_heat_medium: "يتم تمييز حقل عدد المنشورات بشكلٍ متوسط بعد تجاوز معدل الإعجابات:المنشور هذه النسبة."
     topic_post_like_heat_high: "يتم تمييز حقل عدد المنشورات بقوة بعد تجاوز معدل الإعجابات:المنشور هذه النسبة."
     faq_url: "إذا كان لديك صفحة أسئلة شائعة مستضافة في مكانٍ آخر وتريد استخدامها، فأدخِل عنوان URL لها كاملًا هنا."
@@ -1172,13 +1172,13 @@ ar:
     topic_view_duration_hours: "عد مرة عرض الموضوع الجديد مرة واحدة لكل IP/مستخدم كل N ساعة"
     user_profile_view_duration_hours: "عد عرض الملف الشخصي للمستخدم الجديد مرة واحدة لكل IP/مستخدم كل N ساعة"
     levenshtein_distance_spammer_emails: "عدد الأحرف المختلفة الذي سيسمح بمطابقة جزئية عند مطابقة الرسائل الإلكترونية غير المرغوب فيها"
-    max_new_accounts_per_registration_ip: "التوقُّف عن قبول عمليات الاشتراك الجديدة من عنوان IP هذا إذا كان هناك بالفعل (n) حساب من مستوى الثقة 0 منه (ولم يكن لطاقم العمل أو من المستوى الثقة 2 أو أعلى)"
+    max_new_accounts_per_registration_ip: "التوقُّف عن قبول عمليات الاشتراك الجديدة من عنوان IP هذا إذا كان هناك بالفعل (n) حساب من مستوى الثقة 0 منه (ولم يكن لفريق العمل أو من المستوى الثقة 2 أو أعلى)"
     min_ban_entries_for_roll_up: "عند النقر على الزر \"تجميع\"، سيتم إنشاء إدخال حظر جديد في الشبكة الفرعية إذا كان هناك (N) من الإدخالات على الأقل."
     max_age_unmatched_emails: "حذف إدخالات البريد الإلكتروني الخاضعة للمراقبة غير المتطابقة بعد (N) يوم"
     max_age_unmatched_ips: "حذف إدخالات عناوين IP الخاضعة للمراقبة غير المتطابقة بعد (N) يوم"
     num_flaggers_to_close_topic: "الحد الأدنى لعدد البلاغات المطلوب لإيقاف موضوع مؤقتًا للتدخل"
     auto_respond_to_flag_actions: "تفعيل الرد التلقائي عند تجاهل بلاغ"
-    min_first_post_typing_time: "الحد الأدنى للمدة الزمنية التي يجب على المستخدم الكتابة خلالها بالمللي ثانية، إذا لم يتم استيفاء الحد الأدنى، فسيدخل المنشور تلقائيًا في قائمة انتظار الموافقة. اضبطها على 0 للتعطيل (لا يوصى بذلك)"
+    min_first_post_typing_time: "الحد الأدنى للمدة الزمنية التي يجب على المستخدم الكتابة خلالها بالمللي ثانية، إذا لم يتم استيفاء الحد، فسيدخل المنشور تلقائيًا في قائمة انتظار الموافقة. اضبطها على 0 للإيقاف (لا يوصى بذلك)"
     reply_by_email_enabled: "تفعيل الرد على الموضوعات عبر البريد الإلكتروني"
     reply_by_email_address: "نموذج لعنوان البريد الإلكتروني الوارد عند الرد عبر البريد الإلكتروني، مثلًا: %%{reply_key}@reply.example.com أو replies+%%{reply_key}@example.com"
     strip_images_from_short_emails: "إزالة الصور من الرسائل الإلكترونية التي يقل حجمها عن 2800 بايت"
@@ -1186,20 +1186,20 @@ ar:
     display_name_on_email_from: "عرض الأسماء الكاملة في حقول \"من:\" في الرسائل الإلكترونية"
     unsubscribe_via_email: "السماح للمستخدمين بإلغاء الاشتراك في الرسائل الإلكترونية عن طريق إرسال رسالة إلكترونية تحتوي على عبارة \"unsubscribe\" في الموضوع أو النص"
     delete_email_logs_after_days: "حذف سجلات البريد الإلكتروني بعد (N) يوم. 0 للاحتفاظ بها إلى أجلٍ غير مسمى"
-    max_emails_per_day_per_user: "الحد الأقصى لعدد الرسائل الإلكترونية التي سيتم إرسالها إلى المستخدمين يوميًا. 0 لتعطيل الحد"
+    max_emails_per_day_per_user: "الحد الأقصى لعدد الرسائل الإلكترونية التي سيتم إرسالها إلى المستخدمين يوميًا. 0 لإيقاف الحد"
     block_auto_generated_emails: "حظر الرسائل الإلكترونية الواردة التي تم تحديدها على أنها منشأة تلقائيًا."
     ignore_by_title: "تجاهل الرسائل الإلكترونية الواردة بناءً على عنوانها"
-    manual_polling_enabled: "الرسائل الإلكترونية الفورية باستخدام API لردود البريد الإلكتروني"
-    pop3_polling_enabled: "الاتصال عبر POP3 لردود البريد الإلكتروني"
-    pop3_polling_ssl: "استخدم SSL أثناء الاتصال بخادم POP3. (موصى به)"
-    pop3_polling_period_mins: "الفترة بالدقائق بين التحقُّق من حساب POP3 للبريد الإلكتروني. ملاحظة: يتطلب إعادة التشغيل."
-    pop3_polling_port: "المنفذ للاتصال بحساب POP3 من خلاله"
-    pop3_polling_host: "المضيف للاتصال بالبريد الإلكتروني عبر POP3"
-    pop3_polling_username: "اسم المستخدم للاتصال بحساب POP3 للبريد الإلكتروني"
-    pop3_polling_password: "كلمة المرور للاتصال بحساب POP3 للبريد الإلكتروني"
-    email_in: 'السماح للمستخدمين بنشر موضوعات جديدة عبر البريد الإلكتروني (يتطلب الاتصال يدويًا أو عبر POP3). يمكنك إعداد العناوين في علامة التبويب "الإعدادات" لكل فئة.'
+    manual_polling_enabled: "إرسال رسائل إلكترونية فورية باستخدام API لردود البريد الإلكتروني"
+    pop3_polling_enabled: "استقصاء تلقي ردود البريد الإلكتروني عبر POP3"
+    pop3_polling_ssl: "استخدام SSL أثناء الاتصال بخادم POP3 (موصى به)"
+    pop3_polling_period_mins: "المدة بالدقائق بين التحقُّق من حساب POP3 للبريد الإلكتروني. ملاحظة: يتطلب إعادة التشغيل."
+    pop3_polling_port: "منفذ الاستقصاء لحساب POP3"
+    pop3_polling_host: "مضيف استقصاء تلقي الرسائل الإلكترونية عبر POP3"
+    pop3_polling_username: "اسم مستخدم حساب POP3 لاستقصاء تلقي الرسائل الإلكترونية"
+    pop3_polling_password: "كلمة مرور حساب POP3 لاستقصاء تلقي الرسائل الإلكترونية"
+    email_in: 'السماح للمستخدمين بنشر موضوعات جديدة عبر البريد الإلكتروني (يتطلب الاستقصاء يدويًا أو عبر POP3). يمكنك إعداد العناوين في علامة التبويب "الإعدادات" لكل فئة.'
     email_in_min_trust: "الحد الأدنى لمستوى الثقة الذي يحتاجه المستخدم ليتم السماح له بنشر موضوعات جديدة عبر البريد الإلكتروني"
-    email_prefix: "[label] المُستخدَم في موضوع الرسائل الإلكترونية. سيتم استخدام \"العنوان\" افتراضيًا إذا لم يتم تحديده."
+    email_prefix: "[label] المُستخدَم في موضوع الرسائل الإلكترونية. سيتم استخدام \"العنوان\" افتراضيًا إذا لم يتم ضبطه."
     email_site_title: "عنوان الموقع المُستخدَم كمُرسِل للرسائل الإلكترونية من الموقع. سيتم استخدام \"العنوان\" افتراضيًا إذا لم يتم تحديده. إذا كان \"العنوان\" يحتوي على أحرف غير مسموح بها في سلاسل مُرسِل الرسالة الإلكترونية، فاستخدم هذا الإعداد."
     minimum_topics_similar: "عدد الموضوعات التي يجب أن تكون موجودة قبل تقديم موضوعات مشابهة عند كتابة موضوعات جديدة"
     relative_date_duration: "عدد الأيام بعد النشر التي سيتم بعدها عرض تواريخ النشر بشكلٍ نسبي (7 أيام) بدلًا من عرضها بشكلٍ مطلق (20 فبراير)"
@@ -1212,36 +1212,36 @@ ar:
     digest_topics: "الحد الأقصى لعدد الموضوعات الشائعة لعرضها في ملخص البريد الإلكتروني"
     digest_other_topics: "الحد الأقصى لعدد الموضوعات التي سيتم إظهارها في قسم \"الجديد في الموضوعات والفئات التي تتابعها\" من ملخص البريد الإلكتروني"
     digest_suppress_categories: "منع إدراج هذه الفئات في الرسائل الإلكترونية التلخيصية"
-    disable_digest_emails: "تعطيل الرسائل الإلكترونية التلخيصية لجميع المستخدمين"
+    disable_digest_emails: "إيقاف الرسائل الإلكترونية التلخيصية لجميع المستخدمين"
     detect_custom_avatars: "التحقُّق من تحميل المستخدمين صورًا مخصَّصة لملفاتهم الشخصية من عدمه"
     max_daily_gravatar_crawls: "الحد الأقصى لعدد المرات التي سيتحقَّق فيها Discourse من Gravatar بحثًا عن صور رمزية مخصَّصة في اليوم"
     enable_user_directory: "توفير دليل للمستخدمين للتصفُّح"
     allow_anonymous_posting: "السماح للمستخدمين بالتبديل إلى الوضع المجهول"
     anonymous_posting_min_trust_level: "الحد الأدنى لمستوى الثقة المطلوب لتفعيل النشر المجهول"
     anonymous_account_duration_minutes: "لحماية إخفاء الهوية، أنشئ حسابًا مجهولًا جديدًا كل N دقيقة لكل مستخدم. مثال: إذا تم الضبط على 600، سيتم إنشاء حساب مجهول جديد بمجرد مرور 600 دقيقة على آخر منشور وتحوُّل المستخدم إلى مجهول."
-    hide_user_profiles_from_public: "تعطيل بطاقات المستخدمين والملفات الشخصية لهم ودليل المستخدم للمستخدمين المجهولين"
+    hide_user_profiles_from_public: "إيقاف بطاقات المستخدمين والملفات الشخصية لهم ودليل المستخدم للمستخدمين المجهولين"
     allow_profile_backgrounds: "السماح للمستخدمين بتحميل خلفيات للملفات الشخصية"
     sequential_replies_threshold: "عدد المنشورات التي يجب على المستخدم إنشاؤها في على التوالي في الموضوع قبل أن يتم تذكيره بوجود عدد كبير جدًا من الردود المتسلسلة"
-    enable_mobile_theme: "تستخدم الأجهزة الجوَّالة سمة متوافقة مع الجوَّال، مع إمكانية التبديل إلى الموقع الكامل. يمكنك تعطيل هذا إذا كنت تريد استخدام ورقة أنماط مخصَّصة تستجيب بشكلٍ كامل."
+    enable_mobile_theme: "تستخدم الأجهزة الجوَّالة سمة متوافقة مع الجوَّال، مع إمكانية التبديل إلى الموقع الكامل. يمكنك إيقاف هذا إذا كنت تريد استخدام ورقة أنماط مخصَّصة تستجيب بشكلٍ كامل."
     dominating_topic_minimum_percent: "ما النسبة المئوية للمنشورات التي يجب على المستخدم إنشاؤها في الموضوع قبل أن يتم تذكيره بالسيطرة الزائدة على الموضوع."
-    disable_avatar_education_message: "تعطيل الرسالة التعليمية لتغيير الصورة الرمزية"
+    disable_avatar_education_message: "إيقاف الرسالة التعليمية لتغيير الصورة الرمزية"
     suppress_uncategorized_badge: "عدم إظهار الشارة للموضوعات غير المصنَّفة في قوائم الموضوعات"
-    disable_system_edit_notifications: "تعطيل إشعارات التعديل بواسطة مستخدم النظام عندما يكون \"download_remote_images_to_local\" نشطًا."
+    disable_system_edit_notifications: "إيقاف إشعارات التعديل بواسطة مستخدم النظام عندما يكون \"download_remote_images_to_local\" نشطًا."
     automatically_unpin_topics: "إلغاء تثبيت الموضوعات تلقائيًا عندما يصل المستخدم إلى النهاية"
     read_time_word_count: "عدد الكلمات في الدقيقة لحساب الوقت المقدَّر للقراءة"
     full_name_required: "حقل الاسم الكامل مطلوب في الملف الشخصي للمستخدم"
-    enable_names: "إظهار الاسم الكامل للمستخدم في ملفه الشخصي وبطاقة المستخدم والرسائل الإلكترونية. يمكنك تعطيل هذا الإعداد لإخفاء الاسم الكامل في كل مكان."
+    enable_names: "إظهار الاسم الكامل للمستخدم في ملفه الشخصي وبطاقة المستخدم والرسائل الإلكترونية. يمكنك إيقاف هذا الإعداد لإخفاء الاسم الكامل في كل مكان."
     display_name_on_posts: "إظهار الاسم الكامل للمستخدم في منشوراته بالإضافة إلى اسم المستخدم الخاص به @username"
     show_time_gap_days: "عرض الفجوة الزمنية في الموضوع إذا تم إنشاء منشورين بفارق هذا العدد من الأيام"
     short_progress_text_threshold: "بعد أن يتجاوز عدد المنشورات في الموضوع هذا الرقم، سيعرض شريط التقدُّم رقم المنشور الحالي فقط. إذا غيَّرت عرض شريط التقدُّم، فقد تحتاج إلى تغيير هذه القيمة."
-    warn_reviving_old_topic_age: "سيتم عرض تحذير عندما يبدأ شخص ما في الرد على موضوع يكون فيه الرد الأخير أقدم من هذا العدد من الأيام. يمكنك تعطيل هذا الإعداد عن طريق الضبط على 0."
+    warn_reviving_old_topic_age: "سيتم عرض تحذير عندما يبدأ شخص ما في الرد على موضوع يكون فيه الرد الأخير أقدم من هذا العدد من الأيام. يمكنك إيقاف هذا الإعداد عن طريق الضبط على 0."
     autohighlight_all_code: "فرض تمييز التعليمات البرمجية على جميع كتل التعليمات البرمجية مسبقة التنسيق حتى في حال عدم تحديد اللغة بشكلٍ صريح."
     embed_truncate: "اقتطاع المنشورات المضمَّنة"
     embed_post_limit: "الحد الأقصى لعدد المنشورات التي سيتم تضمينها"
     embed_username_required: "اسم المستخدم مطلوب لإنشاء الموضوع"
     show_create_topics_notice: "إظهار إشعار يطلب من المسؤولين إنشاء بعض الموضوعات إذا كان الموقع يحتوي على أقل من 5 موضوعات عامة"
     delete_drafts_older_than_n_days: "حذف المسودات الأقدم من (n) يوم"
-    slug_generation_method: "اختيار طريقة إنشاء المسار. سيُنشئ الخيار \"ترميز\" سلسلة ترميز النسبة المئوية، بينما سيعطِّل الخيار \"لا يوجد\" المسار تمامًا."
+    slug_generation_method: "اختيار طريقة إنشاء المسار. سيُنشئ الخيار \"ترميز\" سلسلة ترميز النسبة المئوية، بينما سيوقف الخيار \"لا يوجد\" المسار تمامًا."
     enable_emoji: "تفعيل الرموز التعبيرية"
     emoji_set: "كيف تفضِّل الرموز التعبيرية الخاصة بك؟"
     approve_post_count: "عدد المنشورات التي يجب الموافقة عليها من مستخدم جديد أو أساسي"
@@ -1257,7 +1257,7 @@ ar:
     default_other_skip_new_user_tips: "تخطي نصائح وشارات إعداد المستخدم الجديد"
     default_other_like_notification_frequency: "إرسال إشعار إلى المستخدمين بالإعجابات بشكلٍ افتراضي"
     default_topics_automatic_unpin: "إلغاء تثبيت الموضوعات تلقائيًا عندما يصل المستخدم إلى النهاية بشكلٍ افتراضي"
-    default_categories_watching: "قائمة الفئات التي تتم مراقبتها بشكلٍ افتراضي"
+    default_categories_watching: "قائمة الفئات المُراقَبة بشكلٍ افتراضي"
     default_categories_tracking: "قائمة الفئات التي يتم تتبُّعها بشكلٍ افتراضي"
     default_categories_muted: "قائمة الفئات التي يتم كتم صوتها بشكلٍ افتراضي"
     default_categories_watching_first_post: "قائمة الفئات التي سيتم فيها مراقبة أول منشور في كل موضوع جديد بشكلٍ افتراضي."
@@ -1290,7 +1290,6 @@ ar:
     unknown_error: "حدثت مشكلة في حسابك. يُرجى التواصل مع مسؤول الموقع."
     timeout_expired: "انتهت مهلة تسجيل الدخول إلى الحساب، يُرجى محاولة تسجيل الدخول مرة أخرى."
   original_poster: "كاتب المنشور الأصلي"
-  most_posts: "معظم المنشورات"
   most_recent_poster: "أحدث ناشر"
   redirected_to_top_reasons:
     new_user: "مرحبًا بك في مجتمعنا! هذه هي الموضوعات الحديثة الأكثر رواجًا."
@@ -1385,7 +1384,7 @@ ar:
       short: "يجب ألا يقل عدد الأحرف عن %{min}"
       long: "يجب ألا يزيد عدد الأحرف عن %{min}"
       unique: "يجب أن يكون فريدًا"
-      blank: "يجب أن يكون حاضرًا"
+      blank: "يجب أن يكون موجودًا"
       must_end_with_alphanumeric: "يجب أن ينتهي بحرف أو رقم"
       must_not_contain_two_special_chars_in_seq: "يجب ألا يحتوي على تسلسل من حرفين أو أكثر من الأحرف الخاصة (.-_)"
       must_not_end_with_confusing_suffix: "يجب ألا ينتهي بلاحقة مربكة مثل .json أو .png وما إلى ذلك."
@@ -1394,13 +1393,13 @@ ar:
       blocked: "غير مسموح به."
     ip_address:
       blocked: "عمليات التسجيل الجديدة غير مسموح بها من عنوان IP الخاص بك."
-      max_new_accounts_per_registration_ip: "عمليات التسجيل الجديدة غير مسموح بها من عنوان IP الخاص بك (تم الوصول إلى الحد الأقصى). تواصل مع أحد أعضاء طاقم العمل."
+      max_new_accounts_per_registration_ip: "عمليات التسجيل الجديدة غير مسموح بها من عنوان IP الخاص بك (تم الوصول إلى الحد الأقصى). تواصل مع أحد أعضاء فريق العمل."
     website:
       domain_not_allowed: "الموقع الإلكتروني غير صالح. النطاقات المسموح بها هي: %{domains}"
   unsubscribe_mailer:
     subject_template: "التأكيد أنك لم تعُد تريد تلقي تحديثات البريد الإلكتروني من %{site_title}"
   invite_password_instructions:
-    subject_template: "تعيين كلمة المرور لحساب %{site_name}"
+    subject_template: "ضبط كلمة المرور لحساب %{site_name}"
   new_version_mailer:
     subject_template: "[%{email_prefix}] إصدار جديد من Discourse، يتوفَّر تحديث"
   flag_reasons:
@@ -1459,12 +1458,12 @@ ar:
       text_body_template: |
         عذرًا، لكن رسالتك الإلكترونية إلى %{destination} (بعنوان %{former_title}) لم تنجح.
 
-        لا يملك حسابك الامتيازات اللازمة لنشر موضوعات جديدة في تلك الفئة. إذا كنت تعتقد أن هذا خطأ، يمكنك [التواصل مع عضو في طاقم العمل](%{base_url}/about).
+        لا يملك حسابك الامتيازات اللازمة لنشر موضوعات جديدة في تلك الفئة. إذا كنت تعتقد أن هذا خطأ، يمكنك [التواصل مع عضو في فريق العمل](%{base_url}/about).
     email_reject_strangers_not_allowed:
       text_body_template: |
         عذرًا، لكن رسالتك الإلكترونية إلى %{destination} (بعنوان %{former_title}) لم تنجح.
 
-        لا تسمح الفئة التي أرسلت إليها هذه الرسالة الإلكترونية إلا بالردود من المستخدمين الذين يملكون حسابات صالحة وعناوين بريد إلكتروني معروفة. إذا كنت تعتقد أن هذا خطأ، يمكنك [التواصل مع عضو في طاقم العمل](%{base_url}/about).
+        لا تسمح الفئة التي أرسلت إليها هذه الرسالة الإلكترونية إلا بالردود من المستخدمين الذين يملكون حسابات صالحة وعناوين بريد إلكتروني معروفة. إذا كنت تعتقد أن هذا خطأ، يمكنك [التواصل مع عضو في فريق العمل](%{base_url}/about).
     email_reject_invalid_post:
       text_body_template: |
         عذرًا، لكن رسالتك الإلكترونية إلى %{destination} (بعنوان %{former_title}) لم تنجح.
@@ -1483,8 +1482,8 @@ ar:
         many: "%{count} مستخدمًا بانتظار الموافقة"
         other: "%{count} مستخدم بانتظار الموافقة"
     download_remote_images_disabled:
-      subject_template: "تم تعطيل تنزيل الصور البعيدة"
-      text_body_template: "تم تعطيل الإعداد \"download_remote_images_to_local\" بسبب الوصول إلى حد مساحة القرص في \"download_remote_images_threshold\"."
+      subject_template: "تم إيقاف تنزيل الصور البعيدة"
+      text_body_template: "تم إيقاف الإعداد \"download_remote_images_to_local\" بسبب الوصول إلى حد مساحة القرص في \"download_remote_images_threshold\"."
   unsubscribe_link: |
     لإلغاء الاشتراك في هذه الرسائل الإلكترونية، [انقر هنا](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |
@@ -1573,7 +1572,7 @@ ar:
     user_email_seen_recently: "كان آخر ظهور للمستخدم قريبًا"
     user_email_notification_already_read: "تمت قراءة الإشعار المتعلِّق بهذا البريد الإلكتروني بالفعل"
     user_email_notification_topic_nil: "قيمة post.topic هي nil"
-    user_email_post_deleted: "تم حذف المنشور بواسطة الكاتب"
+    user_email_post_deleted: "تم حذف المنشور بواسطة المؤلف"
     user_email_user_suspended: "تم تعليق المستخدم"
     user_email_already_read: "لقد قرأ المستخدم هذا المنشور بالفعل"
     sender_message_blank: "الرسالة خالية"
@@ -1827,7 +1826,7 @@ ar:
               categories_and_top_topics:
                 label: "الفئات والموضوعات الأكثر عرضًا"
       invites:
-        title: "دعوة طاقم العمل"
+        title: "دعوة فريق العمل"
       finished:
         title: "تم إعداد Discourse!"
   joined: "انضممت"
diff --git a/config/locales/server.be.yml b/config/locales/server.be.yml
index 3194a52fb9..29fb1013ef 100644
--- a/config/locales/server.be.yml
+++ b/config/locales/server.be.yml
@@ -1359,7 +1359,6 @@ be:
     timeout_expired: "Уваход у рахункак занадта доўгі (timed out). Калі ласка, паспрабуйце увайсці зноў."
     no_email: "Не быў прадстаўлены адрас электроннай пошты. Калі ласка, звярніцеся да адміністратара сайта."
   original_poster: "арыгінальны плакат"
-  most_posts: "большасць паведамленняў"
   most_recent_poster: "Самыя апошнія аўтары"
   frequent_poster: "Актыўны аўтар"
   redirected_to_top_reasons:
@@ -1891,9 +1890,14 @@ be:
     account_suspended:
       title: "Аккаунт прыпынены"
       subject_template: "[%{email_prefix}] Ваш рахунак быў заблякаваны"
+    account_suspended_forever:
+      title: "Аккаунт прыпынены"
+      subject_template: "[%{email_prefix}] Ваш рахунак быў заблякаваны"
     account_silenced:
       title: "Аккаунт прыпынены"
       subject_template: "[% {Email_prefix}] Ваш уліковы запіс была адключаная"
+    account_silenced_forever:
+      title: "Аккаунт прыпынены"
     account_exists:
       title: "Лік ужо існуе"
       subject_template: "[% {Email_prefix}] Лік ужо існуе"
diff --git a/config/locales/server.bg.yml b/config/locales/server.bg.yml
index e809bf9645..d0950f6baf 100644
--- a/config/locales/server.bg.yml
+++ b/config/locales/server.bg.yml
@@ -44,13 +44,19 @@ bg:
   anonymous: "Анонимен"
   remove_posts_deleted_by_author: "Изтрит от автора"
   inline_oneboxer:
+    topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number} от %{username} "
   themes:
     other_error: "Нещо се обърка при актуализирането на стила"
+    import_error:
+      unpack_failed: "Неуспешно разопаковане на файла"
   emails:
     incoming:
       default_subject: "Тази тема има нужда от заглавие"
       show_trimmed_content: "Показване на съкратеното съдържание"
+      no_subject: "(без тема)"
+      no_body: "(без съдържание)"
+      missing_attachment: "(Прикаченият файл %{filename} липсва)"
       errors:
         empty_email_error: "Се случва, когато raw имейла който получихме беше празен."
         no_message_id_error: "Се случва, когато имейла няма 'Message-Id' хедър."
@@ -881,7 +887,6 @@ bg:
       user: "Потребители"
     results_page: "Резултати от търсенето на '%{term}'"
   original_poster: "Автор"
-  most_posts: "Повечето мнения"
   most_recent_poster: "Последен Автор"
   frequent_poster: "Частен Автор"
   redirected_to_top_reasons:
diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml
index 0f734afff5..62924eb4da 100644
--- a/config/locales/server.bs_BA.yml
+++ b/config/locales/server.bs_BA.yml
@@ -788,7 +788,6 @@ bs_BA:
       user: "Korisnici"
     results_page: "Pretraži za termin '%{term}'"
   original_poster: "Originalni Autor"
-  most_posts: "Najviše postova"
   most_recent_poster: "Posljednji Autor"
   frequent_poster: "Čest Autor"
   redirected_to_top_reasons:
diff --git a/config/locales/server.ca.yml b/config/locales/server.ca.yml
index 0bd76b1ab2..9a71afc817 100644
--- a/config/locales/server.ca.yml
+++ b/config/locales/server.ca.yml
@@ -1794,7 +1794,6 @@ ca:
     no_email: "No s'ha proporcionat cap adreça de correu electrònic. Poseu-vos en contacte amb l'administrador del lloc web."
     email_error: "No s'ha pogut registrar un compte amb l'adreça <b>%{email}</b>. Poseu-vos en contacte amb l'administrador del lloc web."
   original_poster: "Autor original"
-  most_posts: "La majoria de publicacions"
   most_recent_poster: "Qui ha publicat més recentment"
   frequent_poster: "Ha publicat amb freqüència"
   redirected_to_top_reasons:
@@ -2530,9 +2529,15 @@ ca:
     account_suspended:
       title: "Compte suspès"
       subject_template: "[%{email_prefix}] El vostre compte ha estat suspès."
+    account_suspended_forever:
+      title: "Compte suspès"
+      subject_template: "[%{email_prefix}] El vostre compte ha estat suspès."
     account_silenced:
       title: "Compte silenciat"
       subject_template: "[%{email_prefix}] El vostre compte ha estat silenciat"
+    account_silenced_forever:
+      title: "Compte silenciat"
+      subject_template: "[%{email_prefix}] El vostre compte ha estat silenciat"
     account_exists:
       title: "El compte ja existeix"
       subject_template: "[%{email_prefix}] El compte ja existeix"
diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml
index cad4abfa10..6112ed8495 100644
--- a/config/locales/server.cs.yml
+++ b/config/locales/server.cs.yml
@@ -879,7 +879,6 @@ cs:
       user: "Uživatelé"
     results_page: "Výsledky hledání pro '%{term}'"
   original_poster: "Autor tématu"
-  most_posts: "Více příspěvků"
   most_recent_poster: "Poslední přispěvatel"
   frequent_poster: "Častý přispěvatel"
   redirected_to_top_reasons:
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index 9595af2681..0b8a8d23df 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -1775,7 +1775,6 @@ da:
     blank_id_error: "`eksternt_id` er påkrævet men var tomt"
     invite_redeem_failed: "Invitationsindløsning mislykkedes. Kontakt venligst webstedets administrator."
   original_poster: "Oprindelig forfatter"
-  most_posts: "Flest indlæg"
   most_recent_poster: "Seneste forfatter"
   frequent_poster: "Hyppig forfatter"
   poster_description_joiner: ", "
@@ -2745,6 +2744,9 @@ da:
         Du er blevet suspenderet fra forummet indtil %{suspended_till}.
 
         Årsag - %{reason}
+    account_suspended_forever:
+      title: "Konto Suspenderet"
+      subject_template: "[%{email_prefix}] Din konto er blevet suspenderet"
     account_exists:
       title: "Konto findes allerede"
       subject_template: "[%{email_prefix}] Kontoen findes allerede"
@@ -3288,7 +3290,9 @@ da:
   badges:
     mass_award:
       errors:
+        too_many_csv_entries: For mange poster i CSV-filen. Send venligst en CSV-fil med ikke mere end %{count} poster.
         badge_disabled: Aktiver venligst %{badge_name} emblemet først.
+        cant_grant_multiple_times: Kan ikke tildele %{badge_name} emblemet flere gange til en enkelt bruger.
     editor:
       name: Redaktør
       description: Rettet første indlæg
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index 0dcda21518..cc945a3b8c 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -1373,6 +1373,7 @@ de:
     force_https_warning: "Deine Website verwendet SSL, aber `<a href='%{base_path}/admin/site_settings/category/all_results?filter=force_https'>force_https</a>` ist in deinen Website-Einstellungen noch nicht aktiviert."
     out_of_date_themes: "Updates sind für die folgenden Themes verfügbar:"
     unreachable_themes: "Wir konnten die folgenden Themes nicht auf Updates prüfen:"
+    watched_word_regexp_error: "Der reguläre Ausdruck für „%{action}“ überwachte Wörter ist ungültig. Bitte überprüfe deine <a href='%{base_path}/admin/customize/watched_words'>Einstellungen für überwachte Wörter</a> oder deaktiviere die Website-Einstellung „watched words regular expressions“."
   site_settings:
     display_local_time_in_user_card: "Zeigt die lokale Zeit basierend auf der Zeitzone eines Benutzers an, wenn die Benutzerkarte geöffnet wird."
     censored_words: "Wörter, die automatisch durch &#9632;&#9632;&#9632;&#9632; ersetzt werden"
@@ -1588,11 +1589,6 @@ de:
     auth_overrides_email: "Überschreibt lokale E-Mail bei jeder Anmeldung mit externer Website-E-Mail und verhindert lokale Änderungen. Gilt für alle Authentifizierungsanbieter. (WARNUNG: Aufgrund der Normalisierung lokaler E-Mails können Abweichungen auftreten.)"
     auth_overrides_username: "Überschreibt den lokalen Benutzernamen bei jeder Anmeldung mit dem Benutzernamen der externen Website und verhindert lokale Änderungen. Gilt für alle Authentifizierungsanbieter. (WARNUNG: Abweichungen können aufgrund unterschiedlicher Länge/Anforderungen des Benutzernamens auftreten.)"
     auth_overrides_name: "Überschreibt bei jeder Anmeldung den lokalen vollständigen Namen mit dem vollständigen Namen der externen Website und verhindert lokale Änderungen. Gilt für alle Authentifizierungsanbieter."
-    discourse_connect_overrides_avatar: "Überschreibt den Benutzeravatar mit dem externen Website-Avatar aus dem DiscourseConnect-Payload. Wenn diese Option aktiviert ist, dürfen Benutzer keine Avatare auf Discourse hochladen."
-    discourse_connect_overrides_location: "Überschreibt den Benutzerstandort mit dem externen Standort aus dem DiscourseConnect-Payload und verhindert lokale Änderungen."
-    discourse_connect_overrides_website: "Überschreibt die Benutzerwebsite mit dem externen Standort aus dem DiscourseConnect-Payload und verhindert lokale Änderungen."
-    discourse_connect_overrides_profile_background: "Überschreibt den Benutzerprofilhintergrund mit dem externen Website-Avatar aus dem DiscourseConnect-Payload."
-    discourse_connect_overrides_card_background: "Überschreibt den Benutzerkartenhintergrund mit dem externen Website-Avatar aus dem DiscourseConnect-Payload."
     discourse_connect_not_approved_url: "Nicht genehmigte DiscourseConnect-Konten zu dieser URL weiterleiten"
     discourse_connect_allows_all_return_paths: "Beschränke die von DiscourseConnect bereitgestellte Domain für return_paths nicht (standardmäßig muss der Return-Path auf der aktuellen Website liegen)"
     enable_local_logins: "Aktiviert lokale Konten mit Anmeldung über Benutzername und Passwort. WARNUNG: Wenn deaktiviert, kannst du dich möglicherweise nicht mehr anmelden, wenn du nicht vorher mindestens eine alternative Anmeldemethode konfiguriert hast."
@@ -1689,7 +1685,6 @@ de:
     allow_staff_to_upload_any_file_in_pm: "Erlaube Team-Mitgliedern, in privaten Nachrichten alle Dateien hochzuladen."
     strip_image_metadata: "Bild-Metadaten entfernen."
     composer_media_optimization_image_enabled: "Aktiviert die clientseitige Medienoptimierung hochgeladener Bilddateien."
-    composer_media_optimization_image_kilobytes_optimization_threshold: "Mindestgröße der Bilddatei, um die clientseitige Optimierung auszulösen"
     composer_media_optimization_image_resize_dimensions_threshold: "Mindestbreite des Bildes, um die clientseitige Skalierung auszulösen"
     composer_media_optimization_image_resize_width_target: "Bilder, die breiter als `composer_media_optimization_image_dimensions_resize_threshold` sind, werden auf diese Breite angepasst. Muss >= `composer_media_optimization_image_dimensions_resize_threshold` sein."
     composer_media_optimization_image_encode_quality: "JPEG-Encoding-Qualität, die im Re-Encoding-Prozess verwendet wird."
@@ -2144,7 +2139,6 @@ de:
     missing_secret: "Die Authentifizierung ist aufgrund des fehlenden Geheimnisses fehlgeschlagen. Kontaktiere die Website-Administratoren, um dieses Problem zu beheben."
     invite_redeem_failed: "Einlösung der Einladung fehlgeschlagen. Bitte kontaktiere den Administrator der Website."
   original_poster: "Autor des ersten Beitrags"
-  most_posts: "Autor der meisten Beiträge"
   most_recent_poster: "Autor des jüngsten Beitrags"
   frequent_poster: "Autor vieler Beiträge"
   poster_description_joiner: ", "
@@ -2509,7 +2503,7 @@ de:
 
       - Aktualisierung mit dem einfachen **[Ein-Klick-Browser-Upgrade](%{base_url}/admin/upgrade)** durchführen
 
-      - Sieh dir die Neuerungen in den [Versionshinweisen](https://meta.discourse.org/tag/release-notes) an oder wirf einen Blick auf alle [Änderungen bei GitHub](https://github.com/discourse/discourse/commits/master)
+      - Sieh dir die Neuerungen in den [Versionshinweisen](https://meta.discourse.org/tag/release-notes) an oder wirf einen Blick auf alle [Änderungen bei GitHub](https://github.com/discourse/discourse/commits/main)
 
       - Besuche [meta.discourse.org](https://meta.discourse.org) für Neuigkeiten, Diskussionen und Unterstützung rund um Discourse
   new_version_mailer_with_notes:
@@ -2523,7 +2517,7 @@ de:
 
       - Aktualisierung mit dem einfachen **[Ein-Klick-Browser-Upgrade](%{base_url}/admin/upgrade)** durchführen
 
-      - Sieh dir die Neuerungen in den [Versionshinweisen](https://meta.discourse.org/tag/release-notes) an oder wirf einen Blick auf alle [Änderungen bei GitHub](https://github.com/discourse/discourse/commits/master)
+      - Sieh dir die Neuerungen in den [Versionshinweisen](https://meta.discourse.org/tag/release-notes) an oder wirf einen Blick auf alle [Änderungen bei GitHub](https://github.com/discourse/discourse/commits/main)
 
       - Besuche [meta.discourse.org](https://meta.discourse.org) für Neuigkeiten, Diskussionen und Unterstützung rund um Discourse
 
@@ -2648,7 +2642,7 @@ de:
 
         Wir sind sehr froh, dass du deine Zeit mit uns verbringst, und wir würden uns freuen, mehr über dich zu erfahren. Nimm dir etwas Zeit, um [dein Profil auszufüllen](%{base_url}/my/preferences/profile), oder zögere nicht, [ein neues Thema zu beginnen](%{base_url}/categories).
     welcome_staff:
-      title: "Begrüßungsteam"
+      title: "Teambegrüßung"
       subject_template: "Herzlichen Glückwunsch, du hast den Status %{role} erhalten!"
       text_body_template: |
         Ein Team-Mitglied hat dir den Status „%{role}“ verliehen.
@@ -3275,7 +3269,7 @@ de:
 
         %{respond_instructions}
     user_group_mentioned:
-      title: "Benutzer wurde in Gruppe erwähnt"
+      title: "Gruppe wurde erwähnt"
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -4199,19 +4193,19 @@ de:
         Dieses Abzeichen wird verliehen, wenn du alle %{max_likes_per_day} deiner täglichen „Gefällt mir“ an 20 Tagen verwendest. Wahnsinn! Du bist ein Vorbild darin, deine Community-Mitglieder zu ermutigen!
     thank_you:
       name: Dankeschön
-      description: Hat 20 Beiträge mit „Gefällt mir“ und 10 „Gefällt mir“ vergeben
+      description: Hat 20 „Gefällt mir“ für Beiträge erhalten und 10 „Gefällt mir“ vergeben
       long_description: |
-        Dieses Abzeichen wird verliehen, wenn du 20 Beiträge mit „Gefällt mir“ hast und im Gegenzug mindestens 10 „Gefällt mir“ vergeben hast. Wenn jemand deine Beiträge mit „Gefällt mir“ markiert, findest du auch die Zeit, mit „Gefällt mir“ zu markieren, was andere schreiben.
+        Dieses Abzeichen wird verliehen, wenn du für 20 Beiträge ein „Gefällt mir“ erhalten und im Gegenzug mindestens 10 „Gefällt mir“ vergeben hast. Wenn jemand deine Beiträge mit „Gefällt mir“ markiert, findest du auch die Zeit, mit „Gefällt mir“ zu markieren, was andere schreiben.
     gives_back:
       name: Geben und nehmen
-      description: Hat 100 Beiträge mit „Gefällt mir“ und 100 „Gefällt mir“ vergeben
+      description: Hat 100 „Gefällt mir“ für Beiträge erhalten und 100 „Gefällt mir“ vergeben
       long_description: |
-        Dieses Abzeichen wird verliehen, wenn du 100 Beiträge mit „Gefällt mir“ hast und im Gegenzug mindestens 100 „Gefällt mir“ vergeben hast. Danke für deine Selbstlosigkeit!
+        Dieses Abzeichen wird verliehen, wenn du für 100 Beiträge ein „Gefällt mir“ erhalten und im Gegenzug mindestens 100 „Gefällt mir“ vergeben hast. Danke für deine Selbstlosigkeit!
     empathetic:
       name: Empathisch
-      description: Hat 500 Beiträge mit „Gefällt mir“ und 1000 „Gefällt mir“ vergeben
+      description: Hat 500 „Gefällt mir“ für Beiträge erhalten und 1000 „Gefällt mir“ vergeben
       long_description: |
-        Dieses Abzeichen wird verliehen, wenn du 500 Beiträge mit „Gefällt mir“ hast und im Gegenzug mindestens 1000 „Gefällt mir“ vergeben hast. Wow! Du bist ein Vorbild für Großzügigkeit und gegenseitige Wertschätzung :two_hearts:.
+        Dieses Abzeichen wird verliehen, wenn du für 500 Beiträge ein „Gefällt mir“ erhalten und im Gegenzug mindestens 1000 „Gefällt mir“ vergeben hast. Wow! Du bist ein Vorbild für Großzügigkeit und gegenseitige Wertschätzung :two_hearts:.
     first_emoji:
       name: Erstes Emoji
       description: Hat ein Emoji in einem Beitrag verwendet
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index 8f4cbe0a5b..c00c635c66 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -1329,7 +1329,6 @@ el:
     no_email: "Δεν καταχωρήθηκε διεύθυνση email. Παρακαλούμε επικοινωνήστε με την διαχείριση."
     email_error: "Ένας λογαριασμός δεν μπόρεσε να καταχωρηθεί με την διεύθυνση email <b>%{email}</b>. Παρακαλούμε επικοινωνήστε με την διαχείριση."
   original_poster: "Αρχικός Αναρτητής"
-  most_posts: "Περισσότερες Αναρτήσεις"
   most_recent_poster: "Πιο Πρόσφατος Αναρτητής"
   frequent_poster: "Συχνός Αναρτητής"
   redirected_to_top_reasons:
@@ -2028,9 +2027,15 @@ el:
     account_suspended:
       title: "Χρήστης σε Αποβολη"
       subject_template: "[%{email_prefix}] Ο λογαριασμός σου είναι σε κατάσταση αποβολής"
+    account_suspended_forever:
+      title: "Χρήστης σε Αποβολη"
+      subject_template: "[%{email_prefix}] Ο λογαριασμός σου είναι σε κατάσταση αποβολής"
     account_silenced:
       title: "Λογαριασμός σε Σίγαση"
       subject_template: "[%{email_prefix}] Ο λογαριασμός σας είναι σε σίγαση"
+    account_silenced_forever:
+      title: "Λογαριασμός σε Σίγαση"
+      subject_template: "[%{email_prefix}] Ο λογαριασμός σας είναι σε σίγαση"
     account_exists:
       title: "Ο λογαριασμός υπάρχει ήδη"
       subject_template: "[%{email_prefix}] Ο λογαριασμός υπάρχει ήδη"
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index d87688e49a..61da18fc50 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -1588,11 +1588,6 @@ es:
     auth_overrides_email: "Sobrescribir la dirección de correo electrónico local con la del sitio externo en cada inicio de sesión, y evitar cambios locales. Aplica a todos los proveedores de autenticación (CUIDADO: puede haber diferencias por la normalización de direcciones locales de correo)"
     auth_overrides_username: "Sobrescribe el nombre de usuario local con el del sitio externo en cada inicio de sesión, y evita cambios locales. Se aplica a todos los proveedores de autenticación. (CUIDADO: puede haber diferencias si hay distintos requisitos en los nombres de usuarios, como los caracteres o la longitud)"
     auth_overrides_name: "Sobrescribir nombre completo local con el del sitio externo en cada inicio de sesión, y evitar cambios locales. Aplica a todos los proveedores de autenticación."
-    discourse_connect_overrides_avatar: "Sobrescribir el avatar del usuario por el dado por DiscourseConnect. Si se activa, los usuarios no podrán cambiar su avatar ni subir nuevos desde Discourse."
-    discourse_connect_overrides_location: "Sobrescribir la ubicación del usuario con la dada por DiscourseConnect, y evitar cambios locales."
-    discourse_connect_overrides_website: "Sobrescribir página web de los usuarios con la dada por DiscourseConnect, y evitar cambios locales."
-    discourse_connect_overrides_profile_background: "Sobrescribir el fondo de usuario con el externo dado por DiscourseConnect."
-    discourse_connect_overrides_card_background: "Sobrescribir el fondo de la tarjeta de usuario con el dado por DiscourseConnect."
     discourse_connect_not_approved_url: "Redireccionar cuentas no aprobadas a esta URL al iniciar sesión con DiscourseConnect."
     discourse_connect_allows_all_return_paths: "No restringir el dominio para return_paths (rutas de vuelta) de DiscourseConnect (por defecto, la ruta de vuelta debe estar en el sitio actual)"
     enable_local_logins: "Activar inicio de sesión local con usuario y contraseña. CUIDADO: si lo desactivas, puede que no puedas iniciar sesión si no has configurado otro medio alternativo primero."
@@ -1689,7 +1684,6 @@ es:
     allow_staff_to_upload_any_file_in_pm: "Permitir a los miembros del equipo subir cualquier archivo en MP."
     strip_image_metadata: "Eliminar metadatos de imágenes."
     composer_media_optimization_image_enabled: "Permite la optimización multimedia en el lado del cliente de archivos de imágenes cargados."
-    composer_media_optimization_image_kilobytes_optimization_threshold: "Tamaño mínimo del archivo de imagen para activar la optimización del lado del cliente"
     composer_media_optimization_image_resize_dimensions_threshold: "Ancho mínimo de la imagen para activar el redimensionamiento del lado del cliente"
     composer_media_optimization_image_resize_width_target: "Las imágenes con una anchura mayor que «composer_media_optimization_image_dimensions_resize_threshold» serán redimensionadas a esta anchura. Debe ser >= que «composer_media_optimization_image_dimensions_resize_threshold»."
     composer_media_optimization_image_encode_quality: "Calidad de codificación JPEG utilizada en el proceso de recodificación."
@@ -2144,7 +2138,6 @@ es:
     missing_secret: "La autenticación ha fallado porque no se ha incluido el secreto. Ponte en contacto con la administración del sitio web para arreglar este problema."
     invite_redeem_failed: "No se ha podido canjear la invitación. Contacta con la administración del sitio."
   original_poster: "Autor original"
-  most_posts: "Con más publicaciones"
   most_recent_poster: "Autor más reciente"
   frequent_poster: "Autor frecuente"
   poster_description_joiner: ", "
@@ -2500,35 +2493,9 @@ es:
   new_version_mailer:
     title: "Correo electrónico de nueva versión"
     subject_template: "[%{email_prefix}] Nueva versión de Discourse, actualización disponible"
-    text_body_template: |
-      ¡Hurra! Hay una nueva versión de [Discourse] (https://www.discourse.org) disponible.
-
-      Tu versión: %{installed_version}
-      Versión nueva: **%{new_version}**
-
-      Actualiza la versión fácilmente mediante nuestra **[actualización de navegador de un clic](%{base_url}/admin/upgrade)**
-
-      - Descubre qué novedades hay en las [notas de la versión](https://meta.discourse.org/tag/release-notes) o revisa [raw GitHub changelog](https://github.com/discourse/discourse/commits/master)
-
-      - Visita [meta.discourse.org](https://meta.discourse.org) para noticias, discusiones y soporte de Discourse
   new_version_mailer_with_notes:
     title: "Correo electrónico de nueva versión con notas"
     subject_template: "[%{email_prefix}] actualización disponible"
-    text_body_template: |
-      Hurra! Hay una nueva versión de [Discourse] (https://www.discourse.org) disponible.
-
-      Tu versión: %{installed_version}
-      Versión nueva: **%{new_version}**
-
-      Actualiza la versión fácilmente mediante nuestra **[actualización de navegador en un clic](%{base_url}/admin/upgrade)**
-
-      - Descubre qué novedades hay en las [notas de la versión](https://meta.discourse.org/tag/release-notes) o revisa [raw GitHub changelog](https://github.com/discourse/discourse/commits/master)
-
-      - Visita [meta.discourse.org](https://meta.discourse.org) para noticias, discusiones y soporte de Discourse
-
-      ### Notas de la versión
-
-      %{notes}
   flag_reasons:
     off_topic: "Tu publicación fue denunciada como **sin relación con el tema**: la comunidad piensa que no se ajusta debidamente al tema, definido por el título o la primera publicación."
     inappropriate: "Tu publicación fue denunciada como **inapropiada**: la comunidad piensa que es ofensiva, abusiva o que vulnera alguna de las [directrices de la comunidad](%{base_path}/directrices)."
diff --git a/config/locales/server.et.yml b/config/locales/server.et.yml
index 04472aceb3..ffd0951c08 100644
--- a/config/locales/server.et.yml
+++ b/config/locales/server.et.yml
@@ -771,7 +771,6 @@ et:
       category: "Liigid"
       user: "Kasutajad"
   original_poster: "Esialgne postitaja"
-  most_posts: "Enamus postitusi"
   most_recent_poster: "Viimane postitaja"
   frequent_poster: "Tihedam postitaja"
   publish_page:
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index a2eff8f4f5..5cea23ce59 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -1262,7 +1262,6 @@ fa_IR:
     no_email: "ایمیلی وجود ندارد. لطفا با مدیر سایت تماس بگیرید."
     email_error: "با ایمیل <b>%{email}</b> نمی‌توانید عضو شوید. لطفا با مدیریت تماس بگیرید."
   original_poster: "نویسنده اصلی"
-  most_posts: "بیشترین نوشته‌ها"
   most_recent_poster: "جدیدترین نویسنده‌ها"
   frequent_poster: "نویسنده مکرر"
   poster_description_joiner: "، "
@@ -1835,6 +1834,9 @@ fa_IR:
     account_suspended:
       title: "حساب کاربری معلق شد"
       subject_template: "[%{email_prefix}] حساب کاربری شما معلق شده است"
+    account_suspended_forever:
+      title: "حساب کاربری معلق شد"
+      subject_template: "[%{email_prefix}] حساب کاربری شما معلق شده است"
     account_exists:
       title: "حساب کاربری وحود دارد"
       subject_template: "[%{email_prefix}] حساب کاربری وحود دارد"
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index b6243c17c9..4c6fbedaed 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -1589,11 +1589,6 @@ fi:
     auth_overrides_email: "Ohittaa paikallisen sähköpostiosoitteen ulkoisen sivuston sähköpostiosoitteella jokaisella kirjautumiskerralla ja estää paikalliset muutokset. Koskee kaikkia todennuksen tarjoajia. (VAROITUS: paikallisten sähköpostien normalisointi voi aiheuttaa poikkeamia)"
     auth_overrides_username: "Korvaa paikallisen käyttäjätunnuksen ulkoisen sivuston käyttäjätunnuksella jokaisella kirjautumiskerralla ja estää paikalliset muutokset. Koskee kaikkia todennuksen tarjoajia. (VAROITUS: paikallisten käyttäjätunnusten pituus ja vaatimukset voi aiheuttaa poikkeamia)"
     auth_overrides_name: "Korvaa paikallisen koko nimen ulkoisen sivuston koko nimellä jokaisella kirjautumiskerralla ja estää paikalliset muutokset. Koskee kaikkia todennuksen tarjoajia."
-    discourse_connect_overrides_avatar: "Korvaa käyttäjän avatarin ulkoisella DiscourseConnectin kautta haetulla avatarilla. Jos tämä on käytössä, käyttäjä ei voi ladata avataria Discourseen."
-    discourse_connect_overrides_location: "Korvaa käyttäjän sijainnin ulkoisella sijainnilla DiscourseConnectin tiedoista ja estää paikalliset muutokset."
-    discourse_connect_overrides_website: "Korvaa käyttäjän verkkosivuston ulkoisella sijainnilla DiscourseConnectin tiedoista ja estää paikalliset muutokset."
-    discourse_connect_overrides_profile_background: "Korvaa käyttäjän profiilin taustakuvan ulkoisella DiscourseConnectin kautta haetulla avatarilla."
-    discourse_connect_overrides_card_background: "Korvaa käyttäjäkortin taustakuvan ulkoisella DiscourseConnectin kautta haetulla avatarilla."
     discourse_connect_not_approved_url: "Uudelleenohjaa hyväksymättömät DiscourseConnect-tilit tähän URL-osoitteeseen"
     discourse_connect_allows_all_return_paths: "Älä rajoita DiscourseConnectin antamien palautuspolkujen verkkotunnusta (oletuksena palautuspolun on oltava nykyisellä sivustolla)"
     enable_local_logins: "Salli kirjautuminen paikallisesti käyttäjätunnuksen ja salasanan avulla. VAROITUS: jos tämä ei ole käytössä, voi sinun olla mahdotonta kirjautua sisään, jollet ole aiemmin määritellyt ainakin yhtä muuta kirjautumistapaa."
@@ -1690,7 +1685,6 @@ fi:
     allow_staff_to_upload_any_file_in_pm: "Salli henkilökunnan ladata minkätyyppisiä liitteitä tahansa yksityisviesteihin."
     strip_image_metadata: "Poista metatiedot kuvista."
     composer_media_optimization_image_enabled: "Mahdollistaa palvelimeen ladattujen kuvatiedostojen mediaoptimoinnin asiakkaan päässä."
-    composer_media_optimization_image_kilobytes_optimization_threshold: "Kuvatiedoston vähimmäiskoko, joka laukaisee optimoinnin asiakkaan päässä"
     composer_media_optimization_image_resize_dimensions_threshold: "Kuvan vähimmäisleveys, joka laukaisee koon muuttamisen asiakkaan päässä"
     composer_media_optimization_image_resize_width_target: "Kuvat, joiden leveys on suurempi kuin \"composer_media_optimization_image_dimensions_resize_threshold\", muunnetaan tähän leveyteen. Täytyy olla suurempi tai yhtä suuri kuin \"composer_media_optimization_image_dimensions_resize_threshold\"."
     composer_media_optimization_image_encode_quality: "Uudelleenkoodausprosessissa käytetty JPEG-koodauslaatu."
@@ -2145,7 +2139,6 @@ fi:
     missing_secret: "Todennus epäonnistui puuttuvan salausavaimen (secret) vuoksi. Ota yhteyttä sivuston ylläpitoon ongelman korjaamiseksi."
     invite_redeem_failed: "Kutsun lunastus epäonnistui. Ota yhteyttä sivuston ylläpitäjään."
   original_poster: "Alkuperäinen kirjoittaja"
-  most_posts: "Eniten viestejä"
   most_recent_poster: "Uusin kirjoittaja"
   frequent_poster: "Usein kirjoittava"
   poster_description_joiner: ", "
@@ -2501,35 +2494,9 @@ fi:
   new_version_mailer:
     title: "Uusi versio"
     subject_template: "[%{email_prefix}] Uusi Discourse-versio, päivitys saatavilla"
-    text_body_template: |
-      Hurraa, uusi [Discourse-versio](https://www.discourse.org) on saatavilla!
-
-      Sinun versiosi: %{installed_version}
-      Uusi versio: **%{new_version}**
-
-      – Päivitä käyttäen helppoa **[yhden klikkauksen päivitystä selaimessa](%{base_url}/admin/upgrade)**
-
-      – Katso mikä on uutta [julkaisutiedoista](https://meta.discourse.org/tag/release-notes) tai tutki [raakaa GitHubin muutoslokia](https://github.com/discourse/discourse/commits/master)
-
-      – Käy osoitteessa [meta.discourse.org](https://meta.discourse.org) lukemassa uutisia ja keskustelua, tai hae apua Discourseen liittyen
   new_version_mailer_with_notes:
     title: "Uusi versio julkaisumuistiolla"
     subject_template: "[%{email_prefix}] päivitys saatavilla"
-    text_body_template: |
-      Hurraa, uusi [Discourse-versio](https://www.discourse.org) on saatavilla!
-
-      Sinun versiosi: %{installed_version}
-      Uusi versio: **%{new_version}**
-
-      – Päivitä käyttäen helppoa **[yhden klikkauksen päivitystä selaimessa](%{base_url}/admin/upgrade)**
-
-      – Katso mikä on uutta [julkaisutiedoista](https://meta.discourse.org/tag/release-notes) tai tutki [raakaa GitHubin muutoslokia](https://github.com/discourse/discourse/commits/master)
-
-      – Käy osoitteessa [meta.discourse.org](https://meta.discourse.org) lukemassa uutisia ja keskustelua, tai hae apua Discourseen liittyen
-
-      ### Julkaisutiedot
-
-      %{notes}
   flag_reasons:
     off_topic: "Viestisi merkittiin **eksyvän aiheesta**: koetaan, ettei se ei kuulu ketjun aiheeseen, jonka määrittelevät sen aloitusviesti ja otsikko."
     inappropriate: "Viestisi merkittiin **sopimattomaksi**: se koetaan loukkaavaksi, herjaavaksi tai [yhteisön sääntöjen](%{base_path}/guidelines) vastaiseksi."
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index 2276a9d87a..ce206da5b2 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -1589,11 +1589,6 @@ fr:
     auth_overrides_email: "Écrase l'adresse de courriel définie localement en la remplaçant par l'adresse de courriel définie sur le site externe à chaque connexion, et interdit de la modifier localement. S'applique à tous les fournisseurs de service d'authentification. (ATTENTION : des divergences peuvent se produire en raison d'un algorithme de normalisation des adresses de courriel locales)"
     auth_overrides_username: "Écrase le nom d'utilisateur défini localement en le remplaçant par le nom d'utilisateur défini sur le site externe à chaque connexion, et interdit de le modifier localement. S'applique à tous les fournisseurs de service d'authentification. (ATTENTION : des divergences peuvent se produire en raison de contraintes de longueur ou de complexité des noms d'utilisateur)"
     auth_overrides_name: "Écrase le nom complet défini localement en le remplaçant par le nom complet défini sur le site externe à chaque connexion, et interdit de le modifier localement. S'applique à tous les fournisseurs de service d'authentification."
-    discourse_connect_overrides_avatar: "Écrase l'image de profil en la remplaçant par une image de profil définie dans les données transmises par le biais de DiscourseConnect. Si ce paramètre est activé, les utilisateurs ne seront pas autorisés à charger les images de profil sur le serveur Discourse."
-    discourse_connect_overrides_location: "Écrase le champ « Localisation » défini localement en le remplaçant par une valeur définie par un site externe par le biais de données transmises avec le protocole DiscourseConnect, et interdit sa modification locale."
-    discourse_connect_overrides_website: "Écrase le champ « Site Web » défini localement en le remplaçant par une valeur définie par un site externe par le biais de données transmises avec le protocole DiscourseConnect, et interdit sa modification locale."
-    discourse_connect_overrides_profile_background: "Écrase l'arrière-plan du profil défini localement en le remplaçant par une image définie par un site externe par le biais de données transmises avec le protocole DiscourseConnect."
-    discourse_connect_overrides_card_background: "Écrase l'arrière-plan de la carte de l'utilisateur défini localement en le remplaçant par une image définie par un site externe par le biais de données transmises avec le protocole DiscourseConnect."
     discourse_connect_not_approved_url: "Rediriger les comptes DiscourseConnect non validés vers cette URL"
     discourse_connect_allows_all_return_paths: "Ne pas restreindre le nom de domaine du champ return_paths indiqué par DiscourseConnect (si ce paramètres est désactivé, l'emplacement indiqué par « return path » doit se trouver sur le site actuel)"
     enable_local_logins: "Activer l'authentification locale avec nom d'utilisateur et mot de passe. ATTENTION : si ce paramètre est désactivé, il vous sera peut-être impossible de vous connecter si vous n'avez pas configuré au moins une méthode d'authentification alternative."
@@ -1690,7 +1685,6 @@ fr:
     allow_staff_to_upload_any_file_in_pm: "Autoriser les responsables à envoyer n'importe quel fichier dans les messages directs."
     strip_image_metadata: "Enlever les métadonnées de l'image."
     composer_media_optimization_image_enabled: "Permet l'optimisation multimédia côté client des fichiers image téléversés."
-    composer_media_optimization_image_kilobytes_optimization_threshold: "Taille minimale du fichier image pour déclencher l'optimisation côté client"
     composer_media_optimization_image_resize_dimensions_threshold: "Largeur d'image minimale pour déclencher le redimensionnement côté client"
     composer_media_optimization_image_resize_width_target: "Les images dont la largeur est supérieure à « composer_media_optimization_image_dimensions_resize_threshold » seront redimensionnées à cette largeur. Doit être >= à « composer_media_optimization_image_dimensions_resize_threshold »."
     composer_media_optimization_image_encode_quality: "Qualité d'encodage JPEG utilisée dans le processus de réencodage."
@@ -2145,7 +2139,6 @@ fr:
     missing_secret: "L'authentification a échoué du fait de l'absence d'une clé secrète. Nous vous invitons à contacter l'administrateur du site afin de résoudre ce problème."
     invite_redeem_failed: "Il n'a pas été possible d'utiliser ce lien d'invitation. Nous vous invitons à contacter l'administrateur du site."
   original_poster: "Créateur du sujet"
-  most_posts: "Le plus de messages"
   most_recent_poster: "Auteur le plus récent"
   frequent_poster: "Auteur fréquent"
   poster_description_joiner: ", "
@@ -2511,35 +2504,9 @@ fr:
   new_version_mailer:
     title: "Nouvelle version"
     subject_template: "[%{email_prefix}] Nouvelle version de Discourse, mise à jour disponible"
-    text_body_template: |
-      Hourra, une nouvelle version de [Discourse](https://www.discourse.org) est disponible !
-
-      Votre version : %{installed_version}
-      Nouvelle version : **%{new_version}**
-
-      - Mettez à jour depuis le navigateur avec notre **[mise à jour en 1 clic](%{base_url}/admin/upgrade)**
-
-      - Consultez les nouveautés dans les [notes de version](https://meta.discourse.org/tags/release-notes) ou l'[historique GitHub](https://github.com/discourse/discourse/commits/master).
-
-      - Visitez [meta.discourse.org](https://meta.discourse.org) pour obtenir des actualités, des discussions et de l'aide concernant Discourse
   new_version_mailer_with_notes:
     title: "Nouvelle version avec notes de modifications"
     subject_template: "[%{email_prefix}] Mise à jour disponible"
-    text_body_template: |
-      Hourra, une nouvelle version de [Discourse](https://www.discourse.org) est disponible !
-
-      Votre version : %{installed_version}
-      Nouvelle version : **%{new_version}**
-
-      - Mettez à jour depuis le navigateur avec notre **[mise à jour en 1 clic](%{base_url}/admin/upgrade)**
-
-      - Consultez les nouveautés dans les [notes de version](https://meta.discourse.org/tags/release-notes) ou l'[historique GitHub](https://github.com/discourse/discourse/commits/master).
-
-      - Visitez [meta.discourse.org](https://meta.discourse.org) pour obtenir des actualités, des discussions et de l'aide concernant Discourse
-
-      ### Notes de version
-
-      %{notes}
   flag_reasons:
     off_topic: "Votre message a été signalé comme étant **hors sujet** : la communauté considère qu'il ne correspond pas au sujet en question qui est défini par son titre et son premier message."
     inappropriate: "Votre message a été signalé comme étant **répréhensible** : la communauté a estimé que son contenu était offensant, injurieux, violent ou qu'il enfreignait notre [charte communautaire](%{base_path}/guidelines)."
diff --git a/config/locales/server.gl.yml b/config/locales/server.gl.yml
index 5eebc2d047..a929063c6d 100644
--- a/config/locales/server.gl.yml
+++ b/config/locales/server.gl.yml
@@ -1539,11 +1539,6 @@ gl:
     auth_overrides_email: "Sobrescribe o enderezo de correo local co enderezo de correo do sitio externo, e evita os cambios locais. Aplícase a todos os fornecedores de autenticación. (AVISO: poden producirse discrepancias debido á normalización dos enderezos de correo locais)"
     auth_overrides_username: "Sobrescribe o nome de usuario local co nome de usuario do sitio externo en cada inicio de sesión e evita os cambios locais. Aplícase a todos os fornecedores de autenticación. (AVISO: poden producirse discrepancias debido á normalización dos enderezos de correo locais)"
     auth_overrides_name: "Sobrescribe o nome completo co nome completo do sitio externo en cada inicio de sesión e evita os cambios locais. Aplícase a todos os fornecedores de autenticación."
-    discourse_connect_overrides_avatar: "Sobrescribe o avatar do usuario co avatar do sitio externo que transporta a carga de DiscourseConnect. Se está activado, os usuarios non poderán cargar avatares en Discourse."
-    discourse_connect_overrides_location: "Sobrescribe a localización do usuario coa localización do sitio externo que transporta a carga de DiscourseConnect e evita os cambios locais."
-    discourse_connect_overrides_website: "Sobrescribe a localización do sitio web do usuario coa localización do sitio externo que transporta a carga de DiscourseConnect e evita os cambios locais."
-    discourse_connect_overrides_profile_background: "Sobrescribe o fondo do perfil de usuario cun avatar de sitio externo que transporte DiscourseConnect."
-    discourse_connect_overrides_card_background: "Sobrescribe o fondo da tarxeta de usuario cun avatar de sitio externo que transporte a carga de DiscourseConnect."
     discourse_connect_not_approved_url: "Redireccionar contas de DiscourseConnect sen aprobar a este URL"
     discourse_connect_allows_all_return_paths: "Non restrinxa o dominio para return_paths fornecidos por DiscourseConnect (o camiño de devolución debe estar no sitio actual, de modo predeterminado)"
     enable_local_logins: "Active as contas co nome de usuario local e o contrasinal de inicio de sesión. ATENCIÓN: de estar desactivado, quizais non poida iniciar sesión se non configurou previamente cando menos unha método de inicio alternativo."
@@ -2083,7 +2078,6 @@ gl:
     missing_secret: "Fallou a autenticación porque falta a clave secreta. Contacte co administrador do sitio para amañar este problema."
     invite_redeem_failed: "Fallou a recuperación do convite. Póñase en contacto co administrador do sitio."
   original_poster: "Publicador orixinal"
-  most_posts: "Con máis publicacións"
   most_recent_poster: "Publicador máis recente"
   frequent_poster: "Publicador frecuente"
   poster_description_joiner: ", "
@@ -2434,35 +2428,9 @@ gl:
   new_version_mailer:
     title: "Nova versión de servizo de correo"
     subject_template: "[%{email_prefix}] Nova versión de Discourse, actualización dispoñible"
-    text_body_template: |
-      Hurra, está dispoñíbel unha nova versión de [Discourse](https://www.discourse.org).
-
-      A súa versión: %{installed_version}
-      A nova versión: **%{new_version}**
-
-      - Actualice facilmente mediante ** [actualización cun só clic] (%{base_url}/admin/upgrade) **
-
-      - Vexa as novidades nas [notas da edición] (https://meta.discourse.org/tag/release-notes) ou vexa o [rexistro en bruto de cambios en GitHub](https://github.com/discourse/discourse/commits/master)
-
-      - Visite [meta.discourse.org](https://meta.discourse.org) para novas, discusións e apoiar a Discourse
   new_version_mailer_with_notes:
     title: "Nova versión do servizo de correo con notas"
     subject_template: "[%{email_prefix}] actualización dispoñible"
-    text_body_template: |
-      Hurra, está dispoñíbel unha nova versión de [Discourse](https://www.discourse.org).
-
-      A súa versión: %{installed_version}
-      A nova versión: **%{new_version}**
-
-      - Actualice facilmente mediante ** [actualización cun só clic] (%{base_url}/admin/upgrade) **
-
-      - Vexa as novidades nas [notas da edición] (https://meta.discourse.org/tag/release-notes) ou vexa o [rexistro en bruto de cambios en GitHub](https://github.com/discourse/discourse/commits/master)
-
-      - Visite [meta.discourse.org](https://meta.discourse.org) para novas, discusións e apoiar a Discourse
-
-      ### Notas da edición
-
-      %{notes}
   flag_reasons:
     off_topic: "A súa publicación foi denunciada como **fóra de tema**: a comunidade pensa que non se axusta como debe ao tema, tal como está definido no seu título e na primeira publicación."
     inappropriate: "A súa publicación foi denunciada como **inapropiada**: a comunidade pensa que é ofensiva, abusiva ou viola as [as directrices da nosa comunidade](%{base_path}/guidelines)."
@@ -3263,6 +3231,9 @@ gl:
         Queda suspendida a súa participación no foro ata %{suspended_till}.
 
         Razón - %{reason}
+    account_suspended_forever:
+      title: "Conta suspendida"
+      subject_template: "[%{email_prefix}] A súa conta foi suspendida"
     account_silenced:
       title: "Conta silenciada"
       subject_template: "[%{email_prefix}] A súa conta foi silenciada"
@@ -3270,6 +3241,9 @@ gl:
         Queda silenciado no foro ata %{silenced_till}.
 
         Razón - %{reason}
+    account_silenced_forever:
+      title: "Conta silenciada"
+      subject_template: "[%{email_prefix}] A súa conta foi silenciada"
     account_exists:
       title: "A conta xa existe"
       subject_template: "[%{email_prefix}] A conta xa existe"
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 17d31d8ff2..7777bb0235 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -102,6 +102,7 @@ he:
       maximum_staged_user_per_email_reached: "הגעת למספר המרבי של משתמשים מבוימים לדוא״ל."
       no_subject: "(אין נושא)"
       no_body: "(אין גוף)"
+      missing_attachment: "(הקובץ המצורף %{filename} חסר)"
       continuing_old_discussion:
         one: "בהמשך לדיון שהתנהל בכתובת [%{title}](%{url}) כיוון שהוא נוצר לפני למעלה מיום (%{count})."
         two: "בהמשך לדיון שהתנהל בכתובת [%{title}](%{url}) כיוון שהוא נוצר לפני למעלה מיומיים (%{count})."
@@ -1596,6 +1597,7 @@ he:
     gtm_container_id: "מזהה מכולה של Google Tag Manager. למשל: GTM-ABCDEF. <br/>לתשומת לבך: סקריפטים של צד‏־שלישי שנטענים על ידי GTM דורשים הוספה לרשימת ההיתר תחת ‚content security policy script src’."
     enable_escaped_fragments: "נסיגה ל־API של Google's Ajax-Crawling אם לא זוהה סורק אינטרנט. מידע נוסף בכתובת <a href='https://developers.google.com/webmasters/ajax-crawling/docs/learn-more' target='_blank'>https://developers.google.com/webmasters/ajax-crawling/docs/learn-more</a>"
     moderators_manage_categories_and_groups: "לאפשר למפקחים לנהל קטגוריות וקבוצות"
+    moderators_change_post_ownership: "לאפשר למפקחים לשנות בעלות על פוסטים"
     cors_origins: "מקורות שאפשר לבצע להם בקשות קרוס-דומיין (Cross origin requests). כל מקור צריך לכלול את התחילית http:// או https:// . משתנה הסביבה DISCOURCE_ENABLE_CORS חייב להיות true כדי לאפשר CORS."
     use_admin_ip_allowlist: "מנהלים יכולים להיכנס רק אם הכתובת שלהם מופיעה ברשימת כתובות ה־IP המפוקחות (ניהול > יומנים > כתובות IP מפוקחות)."
     blocked_ip_blocks: "רשימת מקטעי כתובות IP פרטיות ש־Discourse לא אמור לסרוק"
@@ -1671,11 +1673,6 @@ he:
     auth_overrides_email: "דריסת כתובת הדוא״ל המקומית בכתובת הדוא״ל מהאתר המרוחק עם כל כניסה למערכת ומניעת שינויים מקומיים. חל על כל ספקי האימות. (אזהרה: עשויות להופיע אי התאמות עקב שינויים באורך/דרישות שם המשתמש)"
     auth_overrides_username: "דריסת שם המשתמש המקומי בשם המשתמש מהאתר המרוחק עם כל כניסה למערכת ומניעת שינויים מקומיים. חל על כל ספקי האימות. (אזהרה: עשויות להופיע אי התאמות עקב שינויים באורך/דרישות שם המשתמש)"
     auth_overrides_name: "דריסת השם המלא המקומי בשם מלא חיצוני עם כל כניסה ולמנוע שינויים מקומיים. חל על כל ספקי האימות."
-    discourse_connect_overrides_avatar: "דריסת התמונה הייצוגית בתמונה ייצוגית חיצונית ממטען ה־DiscourseConnect. אם אפשרות זו פעילה, למשתמשים לא תהיה אפשרות להעלות תמונות ייצוגיות ל־Discourse."
-    discourse_connect_overrides_location: "דריסת מיקום המשתמש במיקום חיצוני ממטען ה־DiscourseConnect ולמנוע שינויים מקומיים."
-    discourse_connect_overrides_website: "דריסת אתר המשתמש במיקום חיצוני ממטען ה־DiscourseConnect ולמנוע שינויים מקומיים."
-    discourse_connect_overrides_profile_background: "דריסת רקע פרופיל המשתמש בתמונה ייצוגית חיצונית ממטען ה־DiscourseConnect."
-    discourse_connect_overrides_card_background: "דריסת רקע כרטיס המשתמש בתמונה ייצוגית חיצונית ממטען ה־DiscourseConnect."
     discourse_connect_not_approved_url: "הפניית חשבונות DiscourseConnect ללא אישור לכתובת הזאת"
     discourse_connect_allows_all_return_paths: "לא להגביל את שמות התחום של נתיבי החזרה (return_paths) שמסופקים על ידי DiscourseConnect (כבררת מחדל, נתיבי החזרה חייבים להיות באתר הנוכחי)"
     enable_local_logins: "הפעלת חשבונות כניסה עם שם משתמש וססמה. אזהרה: השבתה עשויה למנוע את כניסתך אלמלא הגדרת לפחות שיטת כניסה חלופית אחת נוספת."
@@ -1701,6 +1698,7 @@ he:
     discord_secret: "מפתח סודי של Discord"
     discord_trusted_guilds: 'לאפשר רק למשתמש מגילדות ה־Discord האלה להיכנס באמצעות Discord. עליך להשתמש במזהה המספרי של הגילדה. למידע נוסף, יש לעיין בהנחיות ש<a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">כאן</a>. שדה ריק משמעו כל גילדה שהיא.'
     enable_backups: "לאפשר למנהלים ליצור גיבויים של הפורום"
+    allow_restore: "לאפשר שחזור, מה שיכול להחליף את כל (!) המידע באתר! יש להשבית אלא אם כן בכוונתך לשחזר גיבוי"
     maximum_backups: "המספר המקסימלי של גיבויים לשמירה על הכונן. גיבויים ישנים יותר ימחקו אוטומטית"
     automatic_backups_enabled: "הרץ גיבויים אוטומטים כמו שמוגדר בתדירות הגיבויים"
     backup_frequency: "מספר הימים בין גיבויים."
@@ -1772,7 +1770,7 @@ he:
     allow_staff_to_upload_any_file_in_pm: "אפשרו לחברי צוות להעלות כל קובץ בהודעה פרטית."
     strip_image_metadata: "הסרת מטה-דאטה מהתמונה"
     composer_media_optimization_image_enabled: "מאפשר מיטוב של מדיה בצד הלקוח של קובצי תמונה שהועלו."
-    composer_media_optimization_image_kilobytes_optimization_threshold: "גודל קובץ תמונה מזערי להפעלת מיטוב בצד הלקוח"
+    composer_media_optimization_image_bytes_optimization_threshold: "גודל קובץ תמונה מזערי להפעלת מיטוב בצד הלקוח"
     composer_media_optimization_image_resize_dimensions_threshold: "רוחב תמונה מזערי להפעלת שינוי גודל בצד הלקוח"
     composer_media_optimization_image_resize_width_target: "תמונות שרוחבן עולה על `composer_media_optimization_image_dimensions_resize_threshold`, גודלן ישתנה לרוחב זה. הערך חייב להיות >= לעומת `composer_media_optimization_image_dimensions_resize_threshold`."
     composer_media_optimization_image_encode_quality: "איכות קידוד JPEG המשמשת בתהליך הקידוד מחדש."
@@ -2226,7 +2224,6 @@ he:
     missing_secret: "האימות נכשל כי חסר סוד. יש ליצור קשר עם ההנהלה כדי לתקן את התקלה הזאת."
     invite_redeem_failed: "ניצול ההזמנה נכשל. נא ליצור קשר עם הנהלת האתר."
   original_poster: "מפרסמים מקוריים"
-  most_posts: "מירב הפוסטים"
   most_recent_poster: "המפרסמים האחרונים"
   frequent_poster: "מפרסמים מתמידים"
   poster_description_joiner: ", "
@@ -2367,6 +2364,7 @@ he:
     reset_not_allowed_from_ip_address: "אי אפשר לבקש איפוס ססמה מכתובת ה־IP הזאת."
     suspended: "אינך יכול להתחבר עד %{date}."
     suspended_with_reason: "חשבון הושעה עד %{date}: %{reason}"
+    suspended_with_reason_forever: "חשבון מושעה: %{reason}"
     errors: "%{errors}"
     not_available: "לא זמין. נסו %{suggestion}?"
     something_already_taken: "משהו השתבש, אולי שם המשתמש או כתובת הדואר האלקטרוני כבר בשימוש. נסו את קישור שכחתי סיסמה."
@@ -2621,35 +2619,9 @@ he:
   new_version_mailer:
     title: "שולח-מיילים של גרסה חדשה"
     subject_template: "[%{email_prefix}] גרסת Discourse חדשה, עדכון זמין."
-    text_body_template: |
-      היאח, יצאה גרסה חדשה של [Discourse](https://www.discourse.org)!
-
-      הגרסה שלך: %{installed_version}
-      הגרסה החדשה: **%{new_version}**
-
-      - אפשר לשדרג בעזרת **[עדכון בלחיצה אחת דרך הדפדפן](%{base_url}/admin/upgrade)**
-
-      - צפייה ב[הערות המהדורה](https://meta.discourse.org/tag/release-notes) יציגו בפניך את כל השינויים או צפייה ב[יומן השינויים הגולמי של GitHub](https://github.com/discourse/discourse/commits/master)
-
-      - ניתן לבקר ב־[meta.discourse.org](https://meta.discourse.org) לחדשות, דיונים ותמיכה ב־Discourse
   new_version_mailer_with_notes:
     title: "שולח-מיילים של גרסה חדשה עם הערות"
     subject_template: "[%{email_prefix}] עדכון זמין"
-    text_body_template: |
-      היאח, יצאה גרסה חדשה של [Discourse](https://www.discourse.org)!
-
-      הגרסה שלך: %{installed_version}
-      הגרסה החדשה: **%{new_version}**
-
-      - אפשר לשדרג בעזרת **[עדכון בלחיצה אחת דרך הדפדפן](%{base_url}/admin/upgrade)**
-
-      - צפייה ב[הערות המהדורה](https://meta.discourse.org/tag/release-notes) תציג בפניך את כל השינויים או צפייה ב[יומן השינויים הגולמי של GitHub](https://github.com/discourse/discourse/commits/master)
-
-      - ניתן לבקר ב־[meta.discourse.org](https://meta.discourse.org) לחדשות, דיונים ותמיכה ב־Discourse
-
-      ### הערות מהדורה
-
-      %{notes}
   flag_reasons:
     off_topic: "הפוסט שלכם סומן כ **מחוץ לנושא**: הקהילה מרגישה שהוא לא מתאים לנושא, כפי שמוגדר על ידי הכותרת והפוסט הראשון. "
     inappropriate: "התגובה שלך סומנה כ**לא מתאימה**: הקהילה מרגישה שהיא פוגענית או הפרה של [הנחיות הקהילה](%{base_path}/guidelines)"
@@ -3233,6 +3205,7 @@ he:
   subject_re: "תגובה: "
   subject_pm: "[PM] "
   email_from: "%{user_name} דרך %{site_name}"
+  email_from_without_site: "%{user_name}"
   user_notifications:
     previous_discussion: "תגובות קודמות"
     reached_limit:
@@ -3441,6 +3414,13 @@ he:
         הושעית מהפורום עד %{suspended_till}.
 
         סיבה - %{reason}
+    account_suspended_forever:
+      title: "חשבון מושעה"
+      subject_template: "[%{email_prefix}] חשבונך הושעה"
+      text_body_template: |
+        הושעית מהפורום.
+
+        הסיבה - %{reason}
     account_silenced:
       title: "חשבון מושתק"
       subject_template: "[%{email_prefix}] חשבונך הושתק"
@@ -3448,6 +3428,13 @@ he:
         הושתקת בפורום עד %{silenced_till}.
 
         סיבה - %{reason}
+    account_silenced_forever:
+      title: "חשבון מושתק"
+      subject_template: "[%{email_prefix}] חשבונך הושתק"
+      text_body_template: |
+        הושתקת בפורום.
+
+        הסיבה - %{reason}
     account_exists:
       title: "החשבון כבר קיים"
       subject_template: "[%{email_prefix}] החשבון כבר קיים"
@@ -4045,7 +4032,9 @@ he:
     mass_award:
       errors:
         invalid_csv: נתקלנו בשגיאה בשורה מס׳ %{line_number}. נא לוודא שב־CSV יש כתובת דוא״ל אחת בכל שורה.
+        too_many_csv_entries: יותר מדי רשומות בקובץ ה־CSV. נא לספק קובץ CSV עם לא יותר מ־%{count} רשומות.
         badge_disabled: נא לפעיל את העיטור %{badge_name} תחילה.
+        cant_grant_multiple_times: לא ניתן להעניק את %{badge_name} מספר פעמים לאותו המשתמש.
     editor:
       name: עורכים
       description: עריכת פוסט ראשונה
diff --git a/config/locales/server.hu.yml b/config/locales/server.hu.yml
index 51a806f664..02ee6b2646 100644
--- a/config/locales/server.hu.yml
+++ b/config/locales/server.hu.yml
@@ -882,7 +882,6 @@ hu:
     enable_badges: "A jelvény rendszer engedélyezése"
     min_password_length: "Minimum jelszóhossz."
     block_common_passwords: "A 10 000 leggyakoribb jelszó tiltása."
-    discourse_connect_overrides_profile_background: "Felülírja a felhasználói profil hátterét a külső webhely-avatarral a DiscourseConnect payloadból."
     rate_limit_new_user_create_topic: "Egy téma létrehozása után az új felhasználóknak (n) másodpercet kell várniuk, mielőtt új témát hoznának létre."
     suggested_topics: "A javasolt témák száma a téma alján láthatók."
     limit_suggested_to_category: "Csak a javasolt kategóriákból származó témakörök jelenhetnek meg a javasolt témakörökben."
@@ -933,7 +932,6 @@ hu:
     not_found: "A fiókod nem található. Kérjük, lépj kapcsolatba a webhely rendszergazdájával."
     account_not_approved: "A fiókod jóváhagyásra vár. A jóváhagyásról e-mailben küldünk majd neked értesítést."
   original_poster: "Eredeti szerző"
-  most_posts: "Legtöbb bejegyzés"
   most_recent_poster: "Legutóbbi szerzők"
   frequent_poster: "Gyakori szerzők"
   redirected_to_top_reasons:
diff --git a/config/locales/server.hy.yml b/config/locales/server.hy.yml
index 3373150ec2..2a284223ba 100644
--- a/config/locales/server.hy.yml
+++ b/config/locales/server.hy.yml
@@ -1598,7 +1598,6 @@ hy:
     no_email: "Ոչ մի էլ. հասցե չի տրամադրվել: Խնդրում ենք կապվել կայքի ադմինիստրատորի հետ:"
     email_error: "Հնարավոր չէ գրանցել հաշիվ <b>%{email}</b> էլ. հասցեով: Խնդրում ենք կապվել կայքի ադմինիստրատորի հետ:"
   original_poster: "Սկզբնական Հրապարակող"
-  most_posts: "Գրառումների մեծ մասը"
   most_recent_poster: "Ամենավերջին Հրապարակողը"
   frequent_poster: "Հաճախ Հրապարակող"
   redirected_to_top_reasons:
@@ -2433,9 +2432,15 @@ hy:
     account_suspended:
       title: "Հաշիվը Սառեցված է"
       subject_template: "[%{email_prefix}] Ձեր հաշիվը սառեցվել է"
+    account_suspended_forever:
+      title: "Հաշիվը Սառեցված է"
+      subject_template: "[%{email_prefix}] Ձեր հաշիվը սառեցվել է"
     account_silenced:
       title: "Հաշիվը Լռեցված է"
       subject_template: "[%{email_prefix}] Ձեր հաշիվը լռեցված է"
+    account_silenced_forever:
+      title: "Հաշիվը Լռեցված է"
+      subject_template: "[%{email_prefix}] Ձեր հաշիվը լռեցված է"
     account_exists:
       title: "Հաշիվը արդեն գոյություն ունի"
       subject_template: "[%{email_prefix}] Հաշիվը արդեն գոյություն ունի"
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index dc114e5496..f15e292bac 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -53,7 +53,7 @@ it:
   on_another_topic: "Su un altro argomento"
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
-    topic_page_title_post_number_by_user: "#%{post_number} di %{username}"
+    topic_page_title_post_number_by_user: "n°%{post_number} da %{username}"
   themes:
     bad_color_scheme: "Impossibile aggiornare il tema, tavolozza dei colori non valida"
     other_error: "Qualcosa è andato storto durante l'aggiornamento del tema"
@@ -100,10 +100,13 @@ it:
     incoming:
       default_subject: "L'argomento necessita di un titolo"
       show_trimmed_content: "Mostra contenuto tagliato"
-      maximum_staged_user_per_email_reached: "E' stato raggiunto il numero massimo di utenti temporanei creati via email."
+      maximum_staged_user_per_email_reached: "Raggiunto il numero massimo di utenti temporanei creati via email."
       no_subject: "(nessun oggetto)"
       no_body: "(nessun corpo del messaggio)"
       missing_attachment: "(Allegato %{filename} mancante)"
+      continuing_old_discussion:
+        one: "Continuazione della discussione da [%{title}](%{url}), perché è stata creata più di %{count} giorno fa."
+        other: "Continuazione della discussione da [%{title}](%{url}), perché è stata creata più di %{count} giorni fa."
       errors:
         empty_email_error: "Succede quando l'email ricevuta era vuota."
         no_message_id_error: "Succede quando l'email non ha l'intestazione 'Message-Id'."
@@ -161,6 +164,9 @@ it:
       max_emojis: "non può avere più di %{max_emojis_count} emoji"
       emojis_disabled: "non può avere emoji"
       ip_address_already_screened: "è già incluso in una regola esistente"
+      restrict_dependent_destroy:
+        one: "Impossibile cancellare il record poiché esiste un elemento %{record} dipendente"
+        other: "Impossibile cancellare il record poiché esistono %{record} dipendenti"
       too_long:
         one: è troppo lungo (il massimo è di %{count} carattere)
         other: è troppo lungo (il massimo è di %{count} caratteri)
@@ -232,6 +238,7 @@ it:
     disabled_errors:
       discourse_connect_enabled: "Gli inviti sono disabilitati perché è abilitato DiscourseConnect."
       invalid_access: "Non hai il permesso di visualizzare la risorsa richiesta."
+    requires_groups: "Invito salvato. Per dare accesso all'argomento specificato, aggiungi uno dei seguenti gruppi: %{groups}."
   bulk_invite:
     file_should_be_csv: "Il file caricato deve essere in formato csv."
     max_rows: "I primi %{max_bulk_invites} inviti sono stati spediti. Prova a dividere il file in parti più piccole."
@@ -378,6 +385,7 @@ it:
   too_late_to_edit: "Quel messaggio è stato creato troppo tempo fa. Non può più essere modificato né cancellato."
   edit_conflict: "Il messaggio è stato modificato da un altro utente e le tue modifiche non possono più essere salvate."
   revert_version_same: "La versione attuale è la stessa versione che stai cercando di ripristinare."
+  cannot_edit_on_slow_mode: "Questo argomento è in modalità lenta. Per incoraggiare discussioni cortesi e ponderate, non è attualmente permesso modificare vecchi messaggi per questo argomento in tale modalità."
   excerpt_image: "immagine"
   bookmarks:
     errors:
@@ -610,7 +618,7 @@ it:
 
       * Cambiare il titolo a qualsiasi argomento
       * Cambiare la categoria di qualsiasi argomento
-      * I tuoi link potranno essere seguiti ([il nofollow automatico](http://en.wikipedia.org/wiki/Nofollow) è stato rimosso)
+      * I tuoi link potranno essere seguiti ([il nofollow automatico](https://en.wikipedia.org/wiki/Nofollow) è stato rimosso)
       * Accedere alla categoria privata Salotto visibile ai soli utenti che hanno raggiunto il livello di attendibilità 3 o superiore
       * Nascondere messaggi spam con una sola segnalazione
 
@@ -660,8 +668,20 @@ it:
     slow_down: "Hai eseguito questa operazione troppe volte, riprova più tardi."
     too_many_requests: "Hai eseguito questa operazione troppe volte. Attendi %{time_left} prima di riprovare."
     by_type:
+      first_day_replies_per_day: "Apprezziamo il tuo entusiasmo, continua così! Tuttavia, hai raggiunto il numero massimo di risposte che un nuovo utente può creare il primo giorno, un limite introdotto per la sicurezza della nostra comunità. Attendi %{time_left} e sarai in grado di creare altre risposte."
+      first_day_topics_per_day: "Apprezziamo il tuo entusiasmo! Tuttavia, hai raggiunto il numero massimo di argomenti che un nuovo utente può creare il primo giorno, un limite introdotto per la sicurezza della nostra comunità. Attendi %{time_left} e sarai in grado di creare nuovi argomenti."
+      create_topic: "Stai creando argomenti troppo velocemente. Attendi %{time_left} prima di riprovare."
+      create_post: "Stai rispondendo troppo velocemente. Attendi %{time_left} prima di riprovare."
+      delete_post: "Stai cancellando i messaggi troppo velocemente. Attendi %{time_left} prima di riprovare."
+      public_group_membership: "Stai entrando/uscendo dai gruppi troppo frequentemente. Attendi %{time_left} prima di riprovare."
+      topics_per_day: "Hai raggiunto il numero massimo di nuovi argomenti consentiti al giorno. Potrai creare nuovi argomenti tra %{time_left}."
+      pms_per_day: "Hai raggiunto il numero massimo di messaggi consentiti al giorno. Potrai creare nuovi messaggi tra %{time_left}."
+      create_like: "Wow! Hai condiviso molto affetto! Hai raggiunto il numero massimo di Mi piace giornalieri per oggi, ma man mano che guadagni livelli di attendibilità, potrai mettere più Mi piace al giorno. Potrai mettere nuovamente Mi piace ai post tra %{time_left}."
+      create_bookmark: "Hai raggiunto il numero massimo di segnalibri giornalieri. Potrai creare nuovi segnalibri tra %{time_left}."
+      edit_post: "Hai raggiunto il numero massimo di modifiche giornaliere. Potrai inviare nuove modifiche tra %{time_left}."
       live_post_counts: "Stai richiedendo troppo velocemente il conteggio dei messaggi attivi. Attendi %{time_left} prima di riprovare."
       unsubscribe_via_email: "Hai raggiunto il numero massimo di notifiche via email annullate. Attendi %{time_left} prima di riprovare."
+      topic_invitations_per_day: "Hai raggiunto il numero massimo di inviti agli argomenti. Potrai inviare altri inviti tra %{time_left}."
     hours:
       one: "%{count} ora"
       other: "%{count} ore"
@@ -1165,7 +1185,7 @@ it:
     user_to_user_private_messages_with_replies:
       title: "Utente-Utente (incluse le risposte)"
       xaxis: "Giorno"
-      yaxis: "Numero di messaggi personali"
+      yaxis: "Numero di messaggi"
       description: "Numero di tutti i nuovi messaggi e risposte personali."
     system_private_messages:
       title: "Sistema"
@@ -1380,11 +1400,13 @@ it:
     category_search_priority_high_weight: "Peso attribuito alla classificazione per ricerche di alta priorità delle categorie."
     allow_uncategorized_topics: "Permetti la creazione di argomenti senza categoria. ATTENZIONE: se ci sono argomenti senza categoria, devi ricategorizzarli prima di disabilitare questa opzione."
     allow_duplicate_topic_titles: "Permetti più argomenti con lo stesso identico titolo."
+    allow_duplicate_topic_titles_category: "Permetti argomenti con titoli identici e duplicati se la categoria è diversa. L'impostazione allow_duplicate_topic_titles deve essere disabilitata."
     unique_posts_mins: "Quanti minuti prima che un utente possa creare un altro messaggio con lo stesso contenuto"
     educate_until_posts: "Per i primi (n) messaggi di un utente, mostra la finestra a discesa con il pannello di istruzioni per nuovi utenti."
     title: "Il nome di questo sito, da usare nell'attributo title."
     site_description: "Descrivi questo sito in una frase, da usare nell'attributo meta description."
     short_site_description: "Breve descrizione, come usata nel tag title in homepage."
+    contact_email: "Indirizzo email di contatto del principale responsabile di questo sito. Utilizzato per notifiche cruciali, nonché visualizzato sul modulo di contatto <a href='%{base_path}/about' target='_blank'>/about</a> per questioni urgenti."
     contact_url: "URL di contatto per questo sito. Visualizzato nella pagina <a href='%{base_path}/about' target='_blank'>/Informazioni</a> per contatti urgenti."
     crawl_images: "Recupera le immagini dagli URL remoti per inserire le dimensioni corrette di ampiezza e altezza nel tag."
     download_remote_images_to_local: "Scarica localmente le immagini remote; ciò permettei di evitare immagini assenti."
@@ -1436,6 +1458,7 @@ it:
     detailed_404: "Fornisce maggiori dettagli agli utenti sul perché non possono accedere a un argomento specifico. Nota: questo metodo è meno sicuro perché gli utenti sapranno se un URL si collega a un argomento valido."
     enforce_second_factor: "Impone agli utenti di abilitare l'autenticazione a due fattori. Seleziona \"all\" per applicarlo a tutti gli utenti. Seleziona \"staff\" per applicarlo solo agli utenti staff."
     force_https: "Forza il tuo sito ad usare solo HTTPS. ATTENZIONE: NON abilitare questa opzione finché non hai verificato che HTTPS è pienamente configurato e sta funzionando ovunque! Hai verificato il tuo CDN, tutti gli accessi ai social ed ogni logo esterno / dipendenze per essere sicuro che sono anch'essi tutti compatibili con HTTPS?"
+    same_site_cookies: "Utilizza gli stessi cookie del sito. In tal modo si eliminano tutti i vettori Cross Site Request Forgery nei browser supportati (Lax o Strict). Avviso: Strict funzionerà solo su siti che richiedono l'accesso e utilizzano un metodo di autenticazione esterno."
     summary_score_threshold: "Il punteggio minimo richiesto affinché un messaggio sia incluso in 'Riassumi Questo Argomento'"
     summary_posts_required: "Numero minimo di messaggi in un argomento prima che l'opzione 'Riassumi questo argomento' sia abilitata. Le modifiche a questa impostazione verranno applicate retroattivamente entro una settimana."
     summary_likes_required: "Minimo numero di \"Mi piace\" in un argomento prima che l'opzione 'Riassumi questo argomento' sia abilitata. Le modifiche a questa impostazione verranno applicate retroattivamente entro una settimana."
@@ -1477,6 +1500,7 @@ it:
     invite_code: "L'utente deve digitare questo codice per consentire la registrazione dell'account (senza distinzione tra maiuscole e minuscole), se lasciato vuoto sarà ignorato"
     approve_suspect_users: "Aggiungi utenti sospetti alla coda di revisione. Gli utenti sospetti sono quelli che hanno inserito una biografia o un sito web ma non svolgono attività di lettura."
     review_every_post: "Tutti i messaggi devono essere revisionati. ATTENZIONE! NON CONSIGLIATO PER SITI MOLTO ATTIVI."
+    pending_users_reminder_delay_minutes: "Notifica i moderatori se nuovi utenti sono in attesa di approvazione per più di questo numero di minuti. Imposta il valore a -1 per disabilitare le notifiche."
     persistent_sessions: "Gli utenti rimarranno connessi alla chiusura del browser"
     maximum_session_age: "L'utente resterà connesso per n ore dall'ultima visita"
     ga_version: "Versione di Google Universal Analytics da usare: v3 (analytics.js), v4 (gtag)"
@@ -1486,6 +1510,7 @@ it:
     gtm_container_id: "ID del contenitore di Google Tag Manager. ad esempio: GTM-ABCDEF. <br/>Nota: potrebbe essere necessario inserire l'abilitazione degli script di terze parti caricati da GTM in \"Content Security Policy Script src\"."
     enable_escaped_fragments: "Tornare all'API Ajax-Crawling di Google se non viene rilevato alcun webcrawler. Vedi <a href='https://developers.google.com/webmasters/ajax-crawling/docs/learn-more' target='_blank'>https://developers.google.com/webmasters/ajax-crawling/docs/learn-more</a>"
     moderators_manage_categories_and_groups: "Permetti ai moderatori di gestire categorie e gruppi"
+    moderators_change_post_ownership: "Consenti ai moderatori di modificare la proprietà del messaggio"
     cors_origins: "Origini permesse per richieste cross-origin (CORS). Ogni origine deve includere http:// o https://. La variabile d'ambiente DISCOURSE_ENABLE_CORS deve essere impostata come true per abilitare CORS."
     use_admin_ip_allowlist: "Gli amministratori possono effettuare l'accesso solo se usano un indirizzo IP definito nell'elenco degli IP scansionati (Amministratore > Log > IP scansionati)."
     blocked_ip_blocks: "Un elenco di blocchi di indirizzi IP privati che non dovrebbero mai essere sottoposti a indicizzazione per ricerche da Discourse"
@@ -1493,12 +1518,14 @@ it:
     allowed_onebox_iframes: "Un elenco dei domini iframe src permessi tramite gli incorporamenti di Onebox. `*` permetterà tutti i motori Onebox predefiniti."
     allowed_iframes: "Un elenco di prefissi di dominio src iframe che discourse può consentire in modo sicuro nei messaggi"
     allowed_crawler_user_agents: "User Agent dei crawler Web che dovrebbero poter accedere al sito. ATTENZIONE! IMPOSTANDO TALE OPZIONE SARANNO BLOCCATI TUTTI I CRAWLER NON ELENCATI QUI!"
+    blocked_crawler_user_agents: "Parola univoca, senza distinzione tra maiuscole e minuscole, nella stringa user agent che identifica i web crawler cui non si vuole consentire l'accesso al sito. L'impostazione non si applica se è stata definita una lista di elementi consentiti."
     slow_down_crawler_user_agents: "User agent di crawler Web che devono essere limitati in frequenza in robots.txt utilizzando la direttiva Crawl-delay"
     slow_down_crawler_rate: "Se viene specificato slow_down_crawler_user_agents, tale frequenza verrà applicata a tutti i crawler (numero di secondi di ritardo tra le richieste)"
     content_security_policy: "Abilita Content-Security-Policy"
     content_security_policy_report_only: "Abilita Content-Security-Policy-Report-Only"
     content_security_policy_collect_reports: "Abilita raccolta di report di violazioni CSP in /csp_reports"
     content_security_policy_frame_ancestors: "Limita chi può incorporare questo sito in iframes tramite CSP. Controlla gli host ammessi su <a href='%{base_path}/admin/customize/embedding'>Incorporamenti</a>"
+    content_security_policy_script_src: "Sorgenti di script aggiuntivi consentiti. L'host e la rete CDN correnti sono inclusi per impostazione predefinita. Consulta la sezione <a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>Mitigare gli attacchi XSS con i criteri di sicurezza dei contenuti.</a>"
     invalidate_inactive_admin_email_after_days: "Gli account amministratore che non hanno visitato il sito in questo numero di giorni dovranno riconvalidare il proprio indirizzo email prima di accedere. Impostare su 0 per disabilitare."
     top_menu: "Determina quali oggetti appaiono nella navigazione della pagina iniziale, e in quale ordine. Esempio latest|new|unread|categories|top|read|posted|bookmarks"
     post_menu: "Determina quali elementi vengono mostrati nel menu del messaggio, e in quale ordine. Esempio like|edit|flag|delete|share|bookmark|reply"
@@ -1524,10 +1551,12 @@ it:
     send_old_credential_reminder_days: "Attivare promemoria per credenziali più vecchie del numero di giorni indicato"
     email_token_valid_hours: "I messaggi di password dimenticata / attivazione account sono validi per (n) ore."
     enable_badges: "Attiva il sistema a distintivi"
+    max_favorite_badges: "Numero massimo di distintivi che l'utente può selezionare"
     enable_whispers: "Consenti allo staff comunicazioni private all'interno degli argomenti."
     allow_index_in_robots_txt: "Specifica in robots.txt che questo sito permette l'indicizzazione da parte dei motori di ricerca. In casi eccezionali puoi permanentemente <a href='%{base_path}/admin/customize/robots'>ignorare robots.txt</a>."
     blocked_email_domains: "Una lista di domini email separati dal carattere pipe \"|\" con cui gli utenti non possono registrare un account. Ad esempio: mailinator.com|trashmail.net"
     allowed_email_domains: "Una lista di domini email delimitati da carattere pipe (|) che gli utenti DEVONO usare per poter registrare i propri account. ATTENZIONE: gli utenti con domini email differenti da questi non saranno accettati!"
+    auto_approve_email_domains: "Gli utenti con indirizzi email appartenenti a questo elenco di domini verranno approvati automaticamente."
     hide_email_address_taken: "Durante l'iscrizione e nel modulo per la password dimenticata, non informare gli utenti che già esiste un account con un dato indirizzo email."
     log_out_strict: "Quando ci si disconnette, esci da TUTTE le sessioni dell'utente su tutti i dispositivi"
     version_checks: "Controlla in Discourse Hub la presenza di aggiornamenti della versione e mostra i messaggi della nuova versione nel pannello <a href='%{base_path}/admin' target='_blank'>/admin</a>"
@@ -1544,10 +1573,24 @@ it:
     min_admin_password_length: "Lunghezza minima password Amministratore."
     password_unique_characters: "Numero minimo di caratteri unici che una password deve avere."
     block_common_passwords: "Non permettere password che sono nelle 10.000 password più comuni."
+    auth_skip_create_confirm: Registrandosi tramite metodo di autenticazione esterno, non viene mostrato il popup di creazione account. Questa impostazione può essere utilizzata al meglio insieme alle opzioni auth_overrides_email, auth_overrides_username e auth_overrides_name.
     auth_immediately: "Reindirizza automaticamente al sistema di acceso esterno senza l'interazione dell'utente. Questo ha effetto solo quando login_required vale true ed esiste un solo metodo di autenticazione esterno"
+    enable_discourse_connect: "Abilita l'accesso tramite DiscourseConnect (già \"Discourse SSO\") (ATTENZIONE: GLI INDIRIZZI E-MAIL DEGLI UTENTI *DEVONO* ESSERE CONVALIDATI DAL SITO ESTERNO!)"
+    verbose_discourse_connect_logging: "Registra informazioni di diagnostica dettagliate relative a DiscourseConnect su <a href='%{base_path}/logs' target='_blank'>/logs</a>"
+    enable_discourse_connect_provider: "Implementa il protocollo del fornitore DiscourseConnect (già \"Discourse SSO\") nell'endpoint /session/sso_provider. È necessario che sia impostata l'opzione discourse_connect_provider_secrets"
+    discourse_connect_url: "URL dell'endpoint DiscourseConnect (deve includere http:// o https://)"
+    discourse_connect_secret: "Stringa segreta utilizzata per l'autenticazione tramite crittografia delle informazioni DiscourseConnect, deve essere lunga almeno 10 caratteri"
+    discourse_connect_provider_secrets: "Un elenco di coppie dominio-segreto che utilizzano DiscourseConnect. Assicurati che il segreto di DiscourseConnect sia lungo almeno 10 caratteri. Il simbolo jolly * può essere utilizzato per indicare qualsiasi dominio o solo una parte di esso (ad esempio *. Esempio.com)."
     discourse_connect_overrides_bio: "Sovrascrive la biografia utente nel profilo utente ed impedisce agli utenti di cambiarla"
-    discourse_connect_overrides_profile_background: "Sostituisce lo sfondo del profilo utente con l'avatar del sito esterno dal payload DiscourseConnect."
-    discourse_connect_overrides_card_background: "Sostituisce lo sfondo della scheda utente con l'avatar del sito esterno dal payload DiscourseConnect."
+    discourse_connect_overrides_groups: "Sincronizza tutte le appartenenze ai gruppi manuali con i gruppi specificati nell'attributo dei gruppi (ATTENZIONE: se non si specificano i gruppi, tutte le appartenenze ai gruppi manuali saranno cancellate per l'utente)"
+    auth_overrides_email: "Sovrascrive l'email locale con l'email del sito esterno ad ogni accesso e impedisce le modifiche locali. Si applica a tutti i provider di autenticazione. (ATTENZIONE: possono verificarsi discrepanze dovute alla normalizzazione delle email locali)"
+    auth_overrides_username: "Sovrascrive il nome utente locale con il nome utente del sito esterno ad ogni accesso e previene le modifiche locali. Si applica a tutti i provider di autenticazione. (ATTENZIONE: possono verificarsi discrepanze a causa di differenze nella lunghezza/requisiti del nome utente)"
+    auth_overrides_name: "Sovrascrive il nome completo locale con il nome completo del sito esterno a ogni accesso e impedisce modifiche locali. Si applica a tutti i provider di autenticazione."
+    discourse_connect_overrides_avatar: "Sostituisce l'avatar dell'utente con il valore dal payload DiscourseConnect. Se l'impostazione è abilitata, gli utenti non potranno caricare avatar su Discourse."
+    discourse_connect_overrides_location: "Sovrascrive la posizione utente con il valore dal payload DiscourseConnect e impedisce le modifiche locali."
+    discourse_connect_overrides_website: "Sovrascrive il sito web utente con il valore dal payload DiscourseConnect e impedisce le modifiche locali."
+    discourse_connect_overrides_profile_background: "Sostituisce lo sfondo del profilo utente con il valore dal payload DiscourseConnect."
+    discourse_connect_overrides_card_background: "Sostituisce lo sfondo della scheda utente con il valore dal payload DiscourseConnect."
     discourse_connect_not_approved_url: "Reindirizza gli account DiscourseConnect non approvati a questo URL"
     discourse_connect_allows_all_return_paths: "Non restringere il dominio per i return_paths forniti da DiscourseConnect (per impostazione predefinita il percorso di ritorno deve essere sul sito corrente)"
     enable_local_logins: "Abilita gli account di accesso basati su nome utente e password locali. ATTENZIONE: se questa impostazione è disabilitata, potrebbe essere impossibile accedere senza aver precedentemente configurato almeno un metodo di accesso alternativo."
@@ -1609,7 +1652,7 @@ it:
     max_logins_per_ip_per_hour: "Numero massimo di accessi consentiti per indirizzo IP in un'ora"
     max_logins_per_ip_per_minute: "Numero massimo di accessi consentiti per indirizzo IP al minuto"
     max_post_deletions_per_minute: "Numero massimo di messaggi che un utente può eliminare al minuto. Impostare questo valore a 0 per disabilitare l'eliminazione dei messaggi."
-    max_post_deletions_per_day: "Numero massimo di messaggi che un utente può eliminare al giorno. Impostare questo valore a 0 per disabilitare l'eliminazione dei messaggi."
+    max_post_deletions_per_day: "Numero massimo di messaggi che un utente può eliminare al giorno. Imposta questo valore a 0 per disabilitare l'eliminazione dei messaggi."
     invite_link_max_redemptions_limit: "Il numero massimo di riscatti consentiti per i link di invito non può essere superiore a questo valore."
     invite_link_max_redemptions_limit_users: "Il numero massimo di riscatti consentiti per i link di invito generati da utenti regolari non può superare questo valore."
     alert_admins_if_errors_per_minute: "Soglia di errori al minuto che attiva un allarme agli amministratori. Un valore pari a 0 disabilita questa funzione. NOTA: richiede un riavvio."
@@ -1645,7 +1688,7 @@ it:
     allow_staff_to_upload_any_file_in_pm: "Consenti ai membri delle staff di caricare qualsiasi file nei PM."
     strip_image_metadata: "Rimuovi i metadati dalle immagini."
     composer_media_optimization_image_enabled: "Abilita l'ottimizzazione multimediale lato client dei file di immagini caricati."
-    composer_media_optimization_image_kilobytes_optimization_threshold: "Dimensione minima del file di immagini per attivare l'ottimizzazione lato client"
+    composer_media_optimization_image_bytes_optimization_threshold: "Dimensione minima del file di immagini per attivare l'ottimizzazione lato client"
     composer_media_optimization_image_resize_dimensions_threshold: "Larghezza minima dell'immagine per attivare il ridimensionamento lato client"
     composer_media_optimization_image_resize_width_target: "Le immagini con larghezza maggiore di `composer_media_optimization_image_dimensions_resize_threshold` saranno ridimensionate a questa larghezza. il valore deve essere >= di `composer_media_optimization_image_dimensions_resize_threshold`."
     composer_media_optimization_image_encode_quality: "Qualità di codifica JPEG utilizzata nel processo di ricodifica."
@@ -1696,9 +1739,9 @@ it:
     newuser_max_links: "Quanti collegamenti può aggiungere a un messaggio un nuovo utente ."
     newuser_max_embedded_media: "Quanti elementi multimediali incorporati un nuovo utente può aggiungere a un messaggio."
     newuser_max_attachments: "Quanti allegati può aggiungere ad un messaggio un nuovo utente."
-    newuser_max_mentions_per_post: "Massimo numero di menzioni ad un @nome che un utente può fare in un messaggio."
+    newuser_max_mentions_per_post: "Massimo numero di menzioni ad un @nome che un nuovo utente può fare in un messaggio."
     newuser_max_replies_per_topic: "Numero massimo di risposte che un nuovo utente può inviare in un singolo argomento, prima che qualcuno risponda."
-    max_mentions_per_post: "Numero massimo di menzioni ad un @nome che chiunque può fare in un messaggio."
+    max_mentions_per_post: "Numero massimo di notifiche ad un @nome che chiunque può fare in un messaggio."
     max_users_notified_per_group_mention: "Massimo numero di utenti che possono ricevere una notifica se un gruppo è menzionato (se la soglia è raggiunta, nessuna notifica verrà inviata)"
     enable_mentions: "Permetti agli utenti di menzionare altri utenti."
     create_thumbnails: "Crea anteprime e lightbox delle immagini che sono troppo grandi per essere contenute in un messaggio."
@@ -1765,7 +1808,7 @@ it:
     reviewable_claiming: "È necessario rivendicare il contenuto revisionabile prima che possa essere manipolato?"
     reviewable_default_topics: "Mostra contenuto revisionabile raggruppato per argomento per impostazione predefinita"
     reviewable_default_visibility: "Non mostrare elementi revisionabili a meno che non soddisfino questa priorità"
-    reviewable_low_priority_threshold: "Il filtro di priorità nasconde gli elementi sottoposti a revisione che non raggiungono questo punteggio a meno che non venga utilizzato il filtro '(any)'."
+    reviewable_low_priority_threshold: "Il filtro di priorità nasconde gli elementi sottoposti a revisione che non raggiungono questo punteggio a meno che non venga utilizzato il filtro '(tutti)'."
     high_trust_flaggers_auto_hide_posts: "I messaggi di nuovi utenti vengono automaticamente nascosti dopo essere stati contrassegnati come spam da un utente TL3 +"
     cooldown_hours_until_reflag: "Quanto tempo gli utenti dovranno aspettare prima di poter segnalare nuovamente un messaggio"
     slow_mode_prevents_editing: "Stabilisce se la \"Modalità lenta\" impedisce la modifica, dopo il periodo indicato da editing_grace_period."
@@ -1799,7 +1842,7 @@ it:
     always_show_trimmed_content: "Mostra sempre la parte tagliata delle email in arrivo. ATTENZIONE: potrebbe rivelare indirizzi email."
     trim_incoming_emails: "Taglia la parte delle email in arrivo che non è rilevante."
     private_email: "Non includere contenuti da messaggi o argomenti nel titolo o nel corpo dell'email. NOTA: disabilita anche le email riassuntive."
-    email_total_attachment_size_limit_kb: "Dimensione massima dei file allegati alle email in uscita in Kb. Impostare il valore a 0 per disabilitare l'invio di allegati."
+    email_total_attachment_size_limit_kb: "Dimensione massima totale dei file allegati alle email in uscita in Kb. Impostare il valore a 0 per disabilitare l'invio di allegati."
     post_excerpts_in_emails: "Nelle emails di notifica, invia sempre un estratto invece del messaggio completo"
     raw_email_max_length: "Quanti caratteri devono essere memorizzati per i messaggi e-mail in arrivo."
     raw_rejected_email_max_length: "Quanti caratteri devono essere memorizzati per i messaggi e-mail in arrivo rifiutati."
@@ -1826,7 +1869,7 @@ it:
     imap_polling_period_mins: "Intervallo in minuti per il controllo degli account IMAP tra un' e-mail e l'altra."
     imap_polling_old_emails: "Il numero massimo di vecchie email (elaborate) da aggiornare ogni volta che viene interrogata una casella IMAP (0 indica tutte le e-mail)."
     imap_polling_new_emails: "Il numero massimo di nuove e-mail (non elaborate) da aggiornare ogni volta che viene interrogata una casella IMAP."
-    imap_batch_import_email: "Il numero minimo di nuove e-mail che attivano la modalità di importazione (disabilita gli avvisi di messaggi)."
+    imap_batch_import_email: "Il numero minimo di nuove e-mail che attivano la modalità di importazione (disabilita gli avvisi di messaggi importati)."
     email_prefix: "[Etichetta] utilizzata nell'oggetto delle email. Se non impostata sarà 'titolo'."
     email_site_title: "Il titolo del sito utilizzato come mittente delle email dal sito. Impostazione di default a 'titolo' se non impostata. Se il tuo 'titolo' contiene caratteri non consentiti nelle stringhe del mittente email, utilizza questa impostazione."
     find_related_post_with_key: "Utilizza solo la 'reply key' per trovare il messaggio inviato. ATTENZIONE: la disattivazione di questa funzione consente di impersonare l'utente in base all'indirizzo email."
@@ -1834,7 +1877,7 @@ it:
     relative_date_duration: "Dopo quanti giorni dalla pubblicazione le date verranno mostrate in termini assoluti (20 feb) anziché relativi (7g)."
     delete_user_max_post_age: "Non permettere di cancellare utenti il cui primo messaggio è più vecchio di (x) giorni."
     delete_all_posts_max: "Numero massimo di messaggi che possono essere eliminati contemporaneamente con il pulsante Cancella Tutti. Se un utente ha un numero maggiore di tali messaggi, questi non possono essere eliminati contemporaneamente e l'utente non può essere cancellato."
-    delete_user_self_max_post_count: "Il numero massimo di messaggi che un utente può avere mentre consente l'eliminazione automatica dell'account. Impostare il valore su -1 per disabilitare l'eliminazione automatica dell'account."
+    delete_user_self_max_post_count: "Il numero massimo di messaggi che un utente può avere mentre l'eliminazione del suo account da parte dell'utente stesso è consentita. Impostare il valore su -1 per disabilitare l'eliminazione \"fai da te\" dell'account."
     username_change_period: "Il numero massimo di giorni dopo la registrazione entro i quali gli account possono cambiare il loro nome utente (0 per disabilitare la modifica del nome utente)."
     email_editable: "Permetti agli utenti di cambiare l'indirizzo email dopo la registrazione."
     logout_redirect: "URL al quale reindirizzare il browser dopo la disconnessione (ad es. Https://example.com/logout)"
@@ -1872,7 +1915,7 @@ it:
     ignored_users_count_message_threshold: "Informare i moderatori se un determinato utente viene ignorato da molti altri utenti."
     ignored_users_message_gap_days: "Quanto a lungo attendere prima di informare nuovamente i moderatori di un utente che è stato ignorato da molti altri."
     clean_up_inactive_users_after_days: "Numero di giorni prima che un utente inattivo (livello di attendibilità 0 e senza messaggi) venga rimosso. Per disabilitare la pulizia, imposta a 0."
-    clean_up_unused_staged_users_after_days: "Numero di giorni prima che un utente provvisorio inattivo (senza messaggi) venga rimosso. Per disabilitare la cancellazione, impostare il valore a 0."
+    clean_up_unused_staged_users_after_days: "Numero di giorni prima che l'account di un utente provvisorio non utilizzato (senza messaggi) venga rimosso. Per disabilitare la cancellazione, impostare il valore a 0."
     user_selected_primary_groups: "Consenti agli utenti di impostare il proprio gruppo principale"
     max_notifications_per_user: "Quantità massima di notifiche per utente. Se questo numero viene superato, le vecchie notifiche verranno eliminate. Controllo settimanale. Impostare il valore a 0 per disabilitare l'opzione"
     allowed_user_website_domains: "Verrà verificato il sito web dell'utente rispetto a questi domini. Lista delimitata dal carattere pipe."
@@ -1887,7 +1930,7 @@ it:
     permalink_normalizations: "Applicare il seguente regex prima di accedere ai permalink, ad esempio: /(topic.*)\\?.*/\\1 eliminerà le stringhe query dalla route degli argomenti. Il formato è regex+string use \\1 ecc. per accedere alle acquisizioni"
     global_notice: "Mostra un banner di avviso globale URGENTE, EMERGENZA, non eliminabile a tutti i visitatori, impostare l'opzione vuota per nasconderlo (HTML consentito)."
     disable_system_edit_notifications: "Disabilita le notifiche di modifica dall'utente system quando 'download_remote_images_to_local' è attivo."
-    notification_consolidation_threshold: "Il numero di richieste di adesione o di \"Mi piace\" ricevuti prima che le notifiche vengano raccolte in una sola. Impostare il valore a 0 per disabilitare l'opzione."
+    notification_consolidation_threshold: "Il numero di notifiche per richieste di adesione o di \"Mi piace\" ricevuti prima che le notifiche vengano raccolte in una sola. Impostare il valore a 0 per disabilitare l'opzione."
     likes_notification_consolidation_window_mins: "Durata in minuti del periodo in cui le notifiche dei \"mi piace\" sono raccolte in un'unica notifica una volta raggiunta la soglia definita. La soglia può essere configurata tramite l'impostazione `SiteSetting.notification_consolidation_threshold`."
     automatically_unpin_topics: "Spunta automaticamente gli argomenti quando l'utente arriva in fondo."
     read_time_word_count: "Conteggio di parole al minuto per calcolare il tempo stimato di lettura."
@@ -1947,7 +1990,7 @@ it:
     code_formatting_style: "Il pulsante del testo preformattato nel composer verrà predefinito a questo stile di formattazione del codice"
     max_allowed_message_recipients: "Numero massimo di destinatari consentiti in un messaggio privato."
     watched_words_regular_expressions: "Le parole osservate sono espressioni regolari."
-    enable_diffhtml_preview: "Funzionalità sperimentale che utilizza diffHTML per sincronizzare l'anteprima invece anziché effettuare un nuovo rendering completo"
+    enable_diffhtml_preview: "Funzionalità sperimentale che utilizza diffHTML per sincronizzare l'anteprima anziché effettuare un nuovo rendering completo"
     old_post_notice_days: "I giorni prima che l'avviso del messaggi diventi vecchio"
     new_user_notice_tl: "Livello di attendibilità minimo richiesto per vedere le nuove notifiche dei messaggi utente."
     returning_user_notice_tl: "Livello di attendibilità minimo richiesto per vedere le notifiche dei messaggi di utenti che ritornano."
@@ -2030,6 +2073,7 @@ it:
     share_quote_buttons: "Determina quali elementi appaiono nel widget di condivisione citazioni e in quale ordine."
     share_quote_visibility: "Determina quando mostrare i pulsanti di condivisione delle citazioni: mai, solo agli utenti anonimi o a tutti gli utenti. "
     create_revision_on_bulk_topic_moves: "Crea una revisione per i primi messaggi quando gli argomenti vengono spostati in blocco in una nuova categoria."
+    allow_changing_staged_user_tracking: "Consenti a un utente amministratore di modificare le preferenze di notifica di etichette e categorie di utenti provvisori."
     errors:
       invalid_email: "Indirizzo email non valido."
       invalid_username: "Non c'è alcun utente con quel nome."
@@ -2056,10 +2100,10 @@ it:
       user_locale_not_enabled: "Prima di attivare questa impostazione, devi abilitare 'allow user locale'."
       invalid_regex: "Regex non è valido o non è consentito."
       email_editable_enabled: "Prima di attivare questa impostazione, devi disabilitare 'email editable'."
-      staged_users_disabled: "Devi abilitare 'staged users' prima di attivare questa impostazione ."
+      staged_users_disabled: "Devi abilitare 'staged users' prima di attivare questa impostazione."
       reply_by_email_disabled: "Devi abilitare 'reply by email' prima di attivare questa impostazione ."
       discourse_connect_url_is_empty: "È necessario definire un 'discourse connect url' prima di abilitare questa impostazione."
-      discourse_connect_invite_only: "Non è possibile abilitare DiscourseConnect e inviti allo stesso tempo."
+      discourse_connect_invite_only: "Non è possibile abilitare DiscourseConnect e solo inviti allo stesso tempo."
       enable_local_logins_disabled: "Prima di abilitare questa impostazione è necessario abilitare 'enable local logins'."
       min_username_length_exists: "Non è possibile impostare la lunghezza minima del nome utente a un valore maggiore di quella del nome utente più breve (%{username})."
       min_username_length_range: "Non puoi impostare il minimo più grande del massimo."
@@ -2101,7 +2145,6 @@ it:
     missing_secret: "L'autenticazione non è riuscita per la mancanza del segreto. Contatta gli amministratori del sito per risolvere il problema."
     invite_redeem_failed: "Riscatto dell'invito non riuscito. Contatta l'amministratore del sito."
   original_poster: "Autore iniziale"
-  most_posts: "Maggioranza Messaggi"
   most_recent_poster: "Autore più recente"
   frequent_poster: "Autore Assiduo"
   poster_description_joiner: ", "
@@ -2110,8 +2153,8 @@ it:
     not_seen_in_a_month: "Bentornato! Non ti si vede da un po'. Questi sono gli argomenti più popolari da quando sei stato via."
   merge_posts:
     edit_reason:
-      one: "Un post è stato unito da %{username}"
-      other: "%{count} messaggi sono stati fusi da %{username}"
+      one: "Un messaggio è stato unito da %{username}"
+      other: "%{count} messaggi sono stati uniti da %{username}"
     errors:
       different_topics: "I messaggi appartenenti a diversi argomenti non possono essere fusi."
       different_users: "I messaggi appartenenti a diversi utenti non possono essere fusi."
@@ -2205,7 +2248,7 @@ it:
     suspended: "Non puoi collegarti fino a %{date}."
     suspended_with_reason: "Account sospeso fino a %{date}: %{reason}"
     errors: "%{errors}"
-    not_available: "Non disponibile. Prova %{suggestion}?"
+    not_available: "Non disponibile. Provare %{suggestion}?"
     something_already_taken: "Qualcosa è andato storto, forse il nome utente o l'email sono già registrati. Prova a recuperare la password."
     omniauth_error:
       generic: "Siamo spiacenti, c'è stato un errore durante l'autorizzazione del tuo account. Per favore riprova."
@@ -2244,7 +2287,7 @@ it:
         updating_username: "Aggiornamento nome utente..."
         changing_post_ownership: "Modifica del proprietario del messaggio..."
         merging_given_daily_likes: "Unione dei Mi piace giornalieri dati..."
-        merging_post_timings: "Unione degli orari dei post..."
+        merging_post_timings: "Unione informazioni temporali messaggi..."
         merging_user_visits: "Unione delle visite utenti..."
         updating_site_settings: "Aggiornamento delle impostazioni del sito..."
         updating_user_stats: "Aggiornamento delle statistiche utenti..."
@@ -2369,7 +2412,7 @@ it:
     subject_template: "%{inviter_name} ti ha invitato a partecipare a %{site_domain_name}"
     text_body_template: "%{inviter_name} ti ha invitato a iscriverti\n\n> ** %{site_title} **\n\n> %{site_description} \n\nCon questa nota\n\n> %{user_custom_message} \n\nSe sei interessato, fai clic sul seguente link: \n\n%{invite_link}\n"
   invite_password_instructions:
-    title: "Invito Istruzioni Password"
+    title: "Istruzioni Password di invito"
     subject_template: "Imposta la password per il tuo account su %{site_name}"
     text_body_template: |
       Grazie per aver accettato l'invito su %{site_name} -- benvenuto!
@@ -2443,35 +2486,9 @@ it:
   new_version_mailer:
     title: "Mailer Nuova Versione"
     subject_template: "[%{email_prefix}] Nuova versione di Discourse, aggiornamento disponibile"
-    text_body_template: |
-      Evviva, è finalmente disponibile una nuova versione di [Discourse](https://www.discourse.org)!
-
-      La tua versione: %{installed_version}
-      Nuova versione: **%{new_version}**
-
-      - Passa subito all'ultima versione utilizzando il nostro semplice strumento di **[aggiornamento da browser in un solo clic](%{base_url}/admin/upgrade)**
-
-      - Scopri le novità nelle [note di rilascio](https://meta.discourse.org/tag/release-notes) o visualizza il [log originale delle modifiche GitHub](https://github.com/discourse/discourse/commits/master)
-
-      - Visita [meta.discourse.org](https://meta.discourse.org) per scoprire notizie, discussioni e ricevere supporto su Discourse
   new_version_mailer_with_notes:
     title: "Mailer Nuova Versione con Note"
     subject_template: "[%{email_prefix}] aggiornamento disponibile"
-    text_body_template: |
-      Evviva, è finalmente disponibile una nuova versione di [Discourse](https://www.discourse.org)!
-
-      La tua versione: %{installed_version}
-      Nuova versione: **%{new_version}**
-
-      - Passa subito all'ultima versione utilizzando il nostro semplice strumento di **[aggiornamento da browser in un solo clic](%{base_url}/admin/upgrade)**
-
-      - Scopri le novità nelle [note di rilascio](https://meta.discourse.org/tag/release-notes) o visualizza il [log originale delle modifiche GitHub](https://github.com/discourse/discourse/commits/master)
-
-      - Visita [meta.discourse.org](https://meta.discourse.org) per scoprire notizie, discussioni e ricevere supporto su Discourse
-
-      ### Note di rilascio
-
-      %{notes}
   flag_reasons:
     off_topic: "Il tuo messaggio è stato segnalato come **fuori tema**: la comunità pensa che non riguardi l'argomento, come attualmente definito dal titolo e dal contenuto del primo messaggio."
     inappropriate: "Il tuo messaggio è stato segnalato come **inappropriato**: la comunità lo ritiene offensivo, ingiurioso o una violazione delle [linee guida della comunità](%{base_path}/guidelines)."
@@ -2563,7 +2580,7 @@ it:
       subject_template: "Grazie per aver passato del tempo con noi"
       text_body_template: "Salve! \nAbbiamo notato con piacere che hai letto molto, quindi ti abbiamo promosso al successivo [Livello di attendibilità!](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)\n\nSiamo davvero felici che tu stia trascorrendo del tempo con noi e ci piacerebbe sapere di più su di te. Prenditi un momento per [compilare il tuo profilo](%{base_url}/my/preferences/profile), o sentiti libero di [iniziare un nuovo argomento](%{base_url}/categories).\n"
     welcome_staff:
-      title: "Staff di benvenuto"
+      title: "Benvenuto nello staff"
       subject_template: "Congratulazioni, ti è stato riconosciuto lo stato di %{role}!"
       text_body_template: |
         Ti è stato riconosciuto lo stato di %{role} da un altro membro dello staff.
@@ -2787,7 +2804,7 @@ it:
 
           - Il tuo software di posta elettronica ha utilizzato correttamente l'indirizzo email Rispondi a: durante la risposta? Purtroppo, alcuni software di posta elettronica inviano erroneamente risposte all'indirizzo Da:, che non funzionerà.
 
-          - L'intestazione Message-ID nell'e-mail è stata modificata? Il campo Mesage-ID deve essere usato correttamente e senza variazioni.
+          - L'intestazione Message-ID nell'e-mail è stata modificata? Il campo Message-ID deve essere usato correttamente e senza variazioni.
 
         Hai bisogno ancora di assistenza? Faccelo sapere tramite i recapiti della sezione Contattaci riportati in %{base_url}/about
     email_reject_old_destination:
@@ -2833,6 +2850,10 @@ it:
       title: "Email Rifiutate - Risposta Non Consentita"
       subject_template: "[%{email_prefix}] Problema alla posta elettronica - Risposta non consentita"
       text_body_template: "Siamo spiacenti, ma il tuo messaggio email per %{destination} (intitolato %{former_title}) non ha funzionato. \n\nNon hai le autorizzazioni per rispondere all'argomento. Se ritieni che si tratti di un errore, [contatta un membro dello staff] (%{base_url}/about).\n"
+    email_reject_reply_to_digest:
+      title: "Email di risposta a un messaggio di riepilogo rifiutata"
+      subject_template: "[%{email_prefix}] Problema e-mail - Risposta a un messaggio di riepilogo"
+      text_body_template: "Siamo spiacenti, ma il tuo messaggio email per %{destination} (intitolato %{former_title}) non ha funzionato. \n\nHai risposto a un'e-mail di riepilogo, e questo non è consentito.\n\nSe ritieni che si tratti di un errore, [contatta un membro dello staff] (%{base_url}/about).\n"
     email_error_notification:
       title: "Notifica Errore Email"
       subject_template: "[%{email_prefix}] Problema email -- errore di autenticazione POP"
@@ -2912,6 +2933,7 @@ it:
     spam_post_blocked:
       title: "Messaggio di Spam bloccato"
       subject_template: "I messaggi del nuovo utente %{username} sono stati bloccati a causa dell'invio ripetuto di link"
+      text_body_template: "Questo è un messaggio automatico.\n\nIl nuovo utente [%{username}] (%{user_url}) ha provato a creare numerosi messaggi contenenti link a %{domains}, ma quei messaggi sono stati bloccati per evitare fenomeni di spam. L'utente è ancora in grado di creare nuovi messaggi purché non contengano link a %{domains}. \n\nPer favore [controlla l'utente] (%{user_url}). \n\nQuesto comportamento può essere modificato agendo sulle impostazioni del sito `newuser_spam_host_threshold` e `allowed_spam_host_domains`. Puoi anche aggiungere %{domains} alla lista dei consentiti se vuoi ammettere tali link.\n"
     unsilenced:
       title: "Non silenziato"
       subject_template: "Account non più sospeso"
@@ -2984,6 +3006,7 @@ it:
     only_reply_by_email_pm: "Rispondi a questa email per replicare a %{participants}."
     visit_link_to_respond: "[Visita Argomento](%{base_url}%{url}) per replicare."
     visit_link_to_respond_pm: "[Visita Messaggio](%{base_url}%{url}) per rispondere a %{participants}."
+    reply_above_line: "## Inserisci la tua risposta al di sopra di questa riga. ##"
     posted_by: "Pubblicato da %{username} il %{post_date}"
     pm_participants: "Partecipanti: %{participants}"
     invited_group_to_private_message_body: |
@@ -3183,9 +3206,17 @@ it:
     account_suspended:
       title: "Account Sospeso"
       subject_template: "[%{email_prefix}] Il tuo account è stato sospeso"
+      text_body_template: |
+        Sei stato sospeso dal forum fino a %{suspended_till}.
+
+        Motivo: %{reason}
     account_silenced:
       title: "Account Silenziato"
       subject_template: "[%{email_prefix}] Il tuo account è stato silenziato"
+      text_body_template: |
+        Sei stato silenziato nel forum fino a %{silenced_till}.
+
+        Motivo: %{reason}
     account_exists:
       title: "L'account esiste già"
       subject_template: "[%{email_prefix}] L'account esiste già"
@@ -3247,6 +3278,13 @@ it:
     admin_login:
       title: "Accesso Amministratore"
       subject_template: "[%{email_prefix}] Accesso"
+      text_body_template: |
+        Qualcuno ha richiesto di accedere con il tuo account su [%{site_name}](%{base_url}).
+
+        Se non sei stato tu a fare questa richiesta, puoi tranquillamente ignorare questa email.
+
+        Clicca sul seguente link per accedere:
+        %{base_url}/session/email-login/%{email_token}
     account_created:
       title: "Account Creato"
       subject_template: "[%{email_prefix}] Il Tuo Nuovo Account"
@@ -3258,9 +3296,21 @@ it:
     confirm_new_email:
       title: "Conferma Nuova Email"
       subject_template: "[%{email_prefix}] Conferma il tuo nuovo indizzo email"
+      text_body_template: |
+        Conferma il tuo nuovo indirizzo mail per %{site_name} cliccando sul seguente link:
+
+        %{base_url}/u/confirm-new-email/%{email_token}
+
+        Se non hai richiesto tu questa modifica, contatta un [amministratore del sito](%{base_url}/about).
     confirm_new_email_via_admin:
       title: "Conferma nuova e-mail"
       subject_template: "[%{email_prefix}] Conferma il tuo nuovo indirizzo mail"
+      text_body_template: |
+        Conferma il tuo nuovo indirizzo mail per %{site_name} cliccando sul seguente link:
+
+        %{base_url}/u/confirm-new-email/%{email_token}
+
+        Questa modifica dell'e-mail è stata richiesta da un amministratore del sito. Se non hai richiesto tu questa modifica, contatta un [amministratore del sito](%{base_url}/about).
     confirm_old_email:
       title: "Conferma Vecchia Email"
       subject_template: "[%{email_prefix}] Conferma il tuo attuale indirizzo email"
@@ -3271,7 +3321,14 @@ it:
 
         %{base_url}/u/confirm-old-email/%{email_token}
     confirm_old_email_add:
+      title: "Conferma vecchia email (Aggiunta)"
       subject_template: "[%{email_prefix}] Conferma il tuo attuale indirizzo email"
+      text_body_template: |
+        Prima di poter aggiungere un nuovo indirizzo email, devi confermare di essere il titolare dell'indirizzo email attuale. Dopo aver completato questo passaggio, dovrai confermare il nuovo indirizzo email.
+
+        Conferma il tuo attuale indirizzo email per %{site_name} cliccando il seguente link:
+
+        %{base_url}/u/confirm-old-email/%{email_token}
     notify_old_email:
       title: "Notifica Vecchia Email"
       subject_template: "[%{email_prefix}] Il tuo indirizzo email è stato cambiato"
@@ -3312,6 +3369,13 @@ it:
         Promuoviamo da sempre un [comportamento civile della comunità](%{base_url}/guidelines).
 
         Buona permanenza!
+    signup_after_reject:
+      title: "Registrazione dopo un rifiuto"
+      subject_template: "Sei stato rifiutato su %{site_name}"
+      text_body_template: |
+        Un membro dello staff ha rifiutato il tuo account su %{site_name}.
+
+        %{reject_reason}
     signup:
       title: "Iscrizione"
       subject_template: "[%{email_prefix}] Conferma il tuo nuovo account"
@@ -3378,6 +3442,7 @@ it:
     missing: "Spiacenti, non troviamo nessun avatar associato a questo indirizzo email. Puoi provare a caricarlo nuovamente?"
   flag_reason:
     sockpuppet: "Un nuovo utente ha creato un argomento, e un altro nuovo utente ha risposto dallo stesso indirizzo IP (%{ip_address}). Vedi l'impostazione del sito <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
+    spam_hosts: "Questo nuovo utente ha provato a creare numerosi messaggi contenenti link allo stesso dominio. Tutti i messaggi di questo utente che contengono link devono essere controllati. Verifica l'impostazione del sito <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
   skipped_email_log:
     exceeded_emails_limit: "Ha superato max_emails_per_day_per_user"
     exceeded_bounces_limit: "Ha superato bounce_score_threshold"
@@ -3402,6 +3467,9 @@ it:
     sender_post_deleted: "il messaggio è stato cancellato"
     sender_message_to_invalid: "il destinatario ha un indirizzo email non valido"
     sender_topic_deleted: "L'argomento è stato eliminato"
+    group_smtp_post_deleted: "il messaggio è stato cancellato"
+    group_smtp_topic_deleted: "l'argomento è stato cancellato"
+    group_smtp_disabled_for_group: "smtp disabilitato per il gruppo"
   color_schemes:
     base_theme_name: "Base"
     light: "Chiaro"
@@ -3434,8 +3502,10 @@ it:
     Modifica il primo messaggio in questo argomento per cambiare il contenuto della pagina %{page_name}.
   guidelines_topic:
     title: "FAQ/Linee Guida"
+    body: "<a name=\"civilized\"></a>\n\n## [Questo è un posto destinato a discussioni pubbliche con toni civili](#civilized)\n\nTi preghiamo di tenere in questo forum di discussione lo stesso comportamento rispettoso che avresti in un parco pubblico. Anche la nostra è una comunità che condivide risorse &mdash; un posto in cui condividere competenze, conoscenze e interessi tramite un dialogo continuo.\n\nQueste regole non sono ferree. Sono linee guida per orientare il buon senso dei membri della nostra comunità e per mantenere questa sede un posto per conversazioni pubbliche condotte in modo gentile, amichevole e civile.\n\n<a name=\"improve\"></a>\n\n## [Migliora la Discussione](#improve)\n\nAiutaci a rendere questo posto la sede ideale per discussioni, aggiungendo sempre qualcosa di positivo, per quanto semplice o breve. Se hai dei dubbi sui messaggi da aggiungere alla conversazione, ripensa a quello che vuoi dire e ritorna a scriverlo più tardi.\n\nUn buon modo per migliorare le discussioni è quello di dare un'occhiata alle conversazioni già in corso. Passa un po' di tempo a leggere gli argomenti aperti prima di aggiungervi risposte o prima di crearne di nuovi. In questo modo, avrai maggiori possibilità di incontrare altre persone che condividono i tuoi interessi.\n\nGli argomenti qui discussi sono importanti per noi e ci aspettiamo che lo siano anche per te e che ti comporti di conseguenza. Devi sempre essere rispettoso degli argomenti discussi e delle persone che discutono, anche se non condividi le opinioni espresse.\n\n<a name=\"agreeable\"></a>\n\n## [Cerca di essere gradevole, anche quando sei in disaccordo](#agreeable)\n\nPuoi sempre rispondere in disaccordo a quanto detto, ci sta. Ma ricorda di _criticare le idee non le persone_. Quindi evita di:\n\n* Offendere\n* Portare attacchi _ad personam_\n* Rispondere al tono di un messaggio invece che al suo reale contenuto \n* Avviare un contraddittorio per partito preso\n\nPiuttosto, fornisci contro-argomentazioni valide che migliorino la discussione.\n\n<a name=\"participate\"></a>\n\n## [La tua partecipazione è importante](#participate)\n\nLe discussioni qui presenti impostano il tono da usare per tutti i nuovi arrivati. Aiutaci a dirigere ed influenzare il futuro di questa comunità scegliendo di partecipare a quelle discussioni che rendono questo forum un posto interessante dove stare &mdash; e, di contro, evitando quelle altre discussioni che invece non lo fanno.\n\nDiscourse fornisce degli strumenti che permettono alla comunità di identificare i contributi migliori (e i peggiori): i preferiti, i segnalibri, i \"mi piace\", le segnalazioni, le risposte, le modifiche, ecc. Usa tutti questi strumenti per migliorare la tua esperienza e quella degli altri.\n \nFacciamo in modo di rendere questa comunità migliore di come l'abbiamo trovata.\n\n<a name=\"flag-problems\"></a>\n\n## [Se noti un problema, segnalalo](#flag-problems)\n\nI moderatori hanno speciali autorità; sono loro i responsabili di questo forum. Ma anche tu lo sei. Con il tuo aiuto, i moderatori possono diventare dei bravi animatori, non dei custodi o dei poliziotti.\n\nSe ti accorgi di comportamenti impropri, non rispondere. La tua risposta incoraggerebbe l'autore a continuare, inoltre consuma inutilmente le tue energie e fa perdere tempo a tutti. Semplicemente _segnalalo_. Se arrivano abbastanza segnalazioni, verranno presi provvedimenti, sia automatici che con l'intervento di un moderatore.\n\nAl fine di gestire al meglio la nostra comunità, i moderatori si riservano il diritto di cancellare qualsiasi contenuto o qualsiasi utente in qualunque momento. I moderatori non leggono i nuovi messaggi prima che vengano pubblicati, perciò loro non sono responsabili per i contenuti inseriti dai membri di questa comunità.\n\n<a name=\"be-civil\"></a>\n\n## [Sii sempre civile](#be-civil)\n\nNon c'è niente di meglio della maleducazione per sabotare una conversazione salutare:\n\n* Sii civile. Non inviare niente che una persona ragionevole possa considerare offensivo, ingiurioso o che inciti all'odio.\n* Non sporcare. Non inviare niente di osceno o di sessualmente esplicito.\n* Rispetta tutti. Non offendere né attaccare nessuno, non spacciarti per qualcun altro, non pubblicare informazioni private altrui.\n* Rispetta il nostro forum. Non pubblicare spam o contenuti vandalici.\n\nAnche se le precedenti non sono regole formali con definizioni esatte &mdash; evita di pubblicare materiale anche se hai il semplice _sospetto_ che rientri in una di queste categorie. Se non sei sicuro se pubblicare o no, chiediti che cosa succederebbe se il tuo messaggio fosse pubblicato sulla prima pagina di uno dei principali siti di notizie.\n\nEssendo questo un forum pubblico, i motori di ricerca indicizzano tutte le nostre discussioni. Mantieni il linguaggio, i tuoi collegamenti e le tue immagini consoni anche per essere visualizzati dai nostri amici e dalle nostre famiglie.\n\n<a name=\"keep-tidy\"></a>\n\n## [Tieni in ordine](#keep-tidy)\n\nFai il piccolo lo sforzo di mettere tutte le cose al loro posto, in modo tale che possiamo tutti spendere più tempo a discutere e meno tempo a ripulire. Quindi:\n\n* Non iniziare un argomento nella categoria sbagliata, controlla sempre prima la definizione della categoria.\n* Non inviare lo stesso messaggio in discussioni diverse. \n* Non inviare risposte prive di contenuto. \n* Non andare fuori tema cambiando discorso. \n* Non firmare i tuoi messaggi &mdash; ogni messaggio ha già allegate le informazioni del tuo profilo.\n\nPiuttosto che inviare un messaggio \"+1\" oppure \"Sono d'accordo\", usa il tasto \"Mi piace\". Piuttosto che andare fuori tema, usa il tasto \"Rispondi con nuovo argomento\".\n\n<a name=\"stealing\"></a>\n\n## [Usa farina del tuo sacco](#stealing)\n\nPer favore non inviare materiale digitale che appartiene a qualcun altro senza il suo permesso. Non inviare descrizioni, collegamenti o metodi per rubare la proprietà intellettuale altrui (software, video, musica, immagini) o che violi qualche altra legge.\n\n<a name=\"power\"></a>\n\n## [Fatto da te](#power)\n\nQuesto sito è gestito dal tuo [simpatico staff](%{base_path}/about) e da *te*, la comunità. Se hai altre domande su come le cose dovrebbero funzionare qui, apri un nuovo argomento nella [categoria Feedback Sito](%{base_path}/c/site-feedback) e parliamone! Se c'è un problema urgente e importante che non si può affrontare in un argomento o con una segnalazione, contattaci tramite la [pagina dello staff](%{base_path}/about).\n\n<a name=\"tos\"></a>\n\n## [Termini del servizio](#tos)\n\nSì, l'avvocatese è noioso, ma ci dobbiamo proteggere &ndash; e, per estensione, proteggere anche te ed i tuoi dati &ndash; contro persone non amichevoli. Abbiamo dei [Termini di Servizio](%{base_path}/tos) che descrivono il tuo (e il nostro) comportamento ed i diritti che riguardano i contenuti, la privacy e le leggi. Per poter usare questo servizio, devi accettare i nostri [TOS](%{base_path}/tos).\n"
   tos_topic:
     title: "Termini del Servizio"
+    body: "I presenti termini regolano l'uso del forum Internet disponibile alla pagina <%{base_url}>. Per utilizzare il forum devi accettare i presenti termini di %{company_name}, la società che gestisce il forum.\n\nTale società può offrire altri prodotti e servizi regolamentati da altri termini e condizioni di utilizzo. I presenti termini si applicano solo all'uso del forum.\n\nVai a:\n\n- [Termini importanti](#heading--important-terms)\n- [La tua autorizzazione all'uso del Forum](#heading--permission)\n- [Condizioni di utilizzo del Forum](#heading--conditions)\n- [Uso accettabile](#heading--acceptable-use)\n- [Standard dei contenuti](#heading--content-standards)\n- [Esecuzione del contratto](#heading--enforcement)\n- [Il tuo account](#heading--your-account)\n- [I tuoi contenuti](#heading--your-content)\n- [Le tue responsabilità](#heading--responsibility)\n- [Scarico di responsabilità](#heading--disclaimers)\n- [Limitazioni di responsabilità](#heading--liability)\n- [Feedback](#heading--feedback)\n- [Conclusione del contratto](#heading--termination)\n- [Controversie](#heading--disputes)\n- [Termini Generali](#heading--general)\n- [Contatti](#heading--contact)\n- [Modifiche](#heading--changes)\n\n<h2 id=\"heading--important-terms\"><a href=\"#heading--important-terms\">Termini importanti</a></h2>\n\n***I presenti termini contengono delle importanti disposizioni che influenzano i tuoi diritti e responsabilità, come le dichiarazioni di non responsabilità in [Scarico delle responsabilità](#heading--disclaimer), i limiti delle responsabilità societarie nei tuoi confronti in [Limitazioni di responsabilità](#heading--liability), le condizioni a tutela della società per i danni causati dall'uso improprio del forum in [Responsabilità per l'uso](#heading-responsibility) e un accordo per risolvere le controversie in [Controversie](#heading--disputes).***\n\n<h2 id=\"heading--permission\"><a href=\"#heading--permission\">La tua autorizzazione all'uso del Forum</a></h2>\n\nLa società ti autorizza all'uso del forum nel rispetto dei presenti termini. Tutti coloro che intendono usare il forum devono accettare tali termini.\n\n<h2 id=\"heading--conditions\"><a href=\"#heading--conditions\">Condizioni di utilizzo del Forum</a></h2>\n\nL'autorizzazione a utilizzare il forum è soggetta alle seguenti condizioni:\n\n1. Devi avere almeno tredici anni.\n\n2. Non puoi più utilizzare il forum se la società ti contatta direttamente per proibirti l'uso.\n\n3. È necessario utilizzare il forum in conformità alle norme di [Uso accettabile](#heading--acceptable-use) e agli [Standard dei contenuti](#heading--content-standards).\n\n<h2 id=\"heading--acceptable-use\"><a href=\"#heading--acceptable-use\">Uso accettabile</a></h2>\n\n1. Non puoi infrangere la legge usando il forum.\n\n2. Non puoi utilizzare o provare a utilizzare l'account di altri sul forum senza la loro specifica autorizzazione.\n\n3. Non è possibile acquistare, vendere o altrimenti scambiare nomi utente o altri identificatori univoci sul forum.\n\n4. Non è possibile inviare annunci pubblicitari, catene postali o altre sollecitazioni attraverso il forum, né utilizzare il forum per raccogliere indirizzi o altri dati personali per mailing list commerciali o database.\n\n5. Non puoi automatizzare l'accesso al forum o monitorare il forum, ad esempio con un web crawler, un plug-in o un componente aggiuntivo del browser o un altro programma per computer diverso da un browser web. Puoi indicizzare il forum per farlo apparire tra i risultati di un motore di ricerca disponibile pubblicamente, se ne gestisci uno.\n\n6. Non puoi utilizzare il forum per inviare posta elettronica a liste di distribuzione, newsgroup o altri gruppi di utenti.\n\n7. Non puoi ritenere in modo falso di essere affiliato o sostenuto dalla società.\n\n8. Non puoi creare hyperlink a immagini o altri contenuti non ipertestuali dal forum verso altre pagine web.\n\n9. Non puoi rimuovere marchi che indicano la titolarità e la proprietà dai materiali scaricati dal forum.\n\n10. Non puoi mostrare alcuna parte del forum su altri siti web con \"<iframe>\".\n\n11. Non puoi disabilitare, evitare o aggirare eventuali restrizioni di sicurezza o di accesso al forum.\n\n12. Non puoi intasare l'infrastruttura del forum con un volume irragionevole di richieste, specie se finalizzate a imporre un carico anomalo sui sistemi informativi alla base del forum.\n\n13. Non puoi impersonare gli altri attraverso il forum.\n\n14. Non puoi incoraggiare o aiutare nessuno a violare questi termini.\n\n<h2 id=\"heading--content-standards\"><a href=\"#heading--content-standards\">Standard dei contenuti</a></h2>\n\n1. Non puoi inviare al forum contenuti illegali, offensivi o altrimenti dannosi per altri. Ciò include contenuti molesti, inappropriati o offensivi.\n\n2. Non puoi inviare al forum contenuti che violino la legge, i diritti di proprietà intellettuale altrui, la privacy di chiunque o gli accordi con altre parti.\n\n3. Non puoi inviare al forum contenuti con codici informatici dannosi, ad esempio virus informatici o spyware.\n\n4. Non puoi inviare al forum contenuti che fungano da semplici segnaposto, per contenere un indirizzo particolare, un nome utente o un altro identificatore univoco.\n\n5. Non puoi utilizzare il forum per divulgare informazioni che non hai il diritto di diffondere, come le informazioni riservate o altrui.\n\n<h2 id=\"heading--enforcement\"><a href=\"#heading--enforcement\">Esecuzione del contratto</a></h2>\n\nLa società può effettuare indagini e perseguire le violazioni di questi termini nella massima misura consentita dalla legge. La società può notificare e cooperare con le forze dell'ordine nel perseguire le violazioni di legge e dei presenti termini.\n\nLa società si riserva il diritto di modificare, rivedere ed eliminare i contenuti sul forum per qualsiasi motivo. Se ritieni che qualcuno abbia inviato contenuti al forum in violazione di questi termini, [contattaci immediatamente](#heading-contact).\n\n<h2 id=\"heading--your-account\"><a href=\"#heading--your-account\">Il tuo account</a></h2>\n\nDevi creare e accedere a un account per utilizzare alcune funzionalità del forum.\n\nPer creare un account, devi fornire alcune informazioni personali. Se crei un account, accetti di fornire almeno un indirizzo e-mail valido e di mantenerlo aggiornato. È possibile chiudere l'account in qualsiasi momento inviando un'e-mail a <%{contact_email}>.\n\nAccetti di essere responsabile di tutte le azioni intraprese utilizzando il tuo account, da te autorizzate o meno, fino a quando non chiudi il tuo account o comunichi alla società che il tuo account è stato violato. Ti impegni ad avvisare immediatamente la società se sospetti che il tuo account sia stato violato. Devi inoltre procedere alla scelta di una password sicura per il tuo account e mantenerla segreta.\n\nLa società può limitare, sospendere o chiudere il tuo account sul forum in base alla sua politica per la gestione delle richieste di rimozione relative al copyright o se la società ha motivi ragionevoli per ritenere che tu abbia violato qualsiasi regola dei presenti termini.\n\n<h2 id=\"heading--your-content\"><a href=\"#heading--your-content\">I tuoi contenuti</a></h2>\n\nNessuna disposizione contenuta nei presenti termini conferisce alla società alcun diritto sulla proprietà intellettuale dei contenuti che condividi nel forum, quali le informazioni del tuo account, i messaggi o altri contenuti che invii al forum. Nessuna disposizione contenuta nei presenti termini ti dà alcun diritto sulle proprietà intellettuali della società.\n\nSei l'unico responsabile dei contenuti che invii al forum. Sei consapevole di non poter ritenere erroneamente che i contenuti che invii al forum siano sponsorizzati o approvati dalla società. Questi termini non obbligano la società a archiviare, mantenere o fornire copie dei contenuti che invii, né a modificarli in base a questi termini.\n\nI contenuti che invii al forum appartengono a te e spetta a te decidere quale autorizzazione dare agli altri su di essi. Ma come minimo, autorizzi la società a fornire i contenuti che invii al forum ad altri utenti del forum. Tale licenza speciale consente alla società di copiare, pubblicare e analizzare i contenuti che invii al forum.\n\nQuando un contenuto inviato è rimosso dal forum, da te o dalla società, la licenza speciale della società termina quando l'ultima copia scompare dai backup, dalle cache e da altri sistemi della società. Altre licenze da te applicate ai contenuti inviati, ad esempio le licenze [Creative Commons](https://creativecommons.org), potrebbero continuare dopo la rimozione del contenuto. Tali licenze possono dare ad altri, o alla società stessa, il diritto di condividere nuovamente i tuoi contenuti attraverso il forum.\n\nAltri soggetti che ricevono contenuti che invii al forum potrebbero violare i termini in base ai quali concedi in licenza i tuoi contenuti. L'utente accetta che la società non sia responsabile nei confronti dell'utente per tali violazioni o le loro conseguenze.\n\n<h2 id=\"heading--responsibility\"><a href=\"#heading--responsibility\">Le tue responsabilità</a></h2>\n\nAccetti di indennizzare la società da rivendicazioni legali da parte di altri in relazione alla violazione di questi termini da parte tua o di altri che utilizzano il tuo account sul forum. Tu e la società vi impegnate a notificare all'altra parte qualsiasi rivendicazione legale per la quale ci potrebbe essere l'obbligo di indennizzare la società il prima possibile. Se la società non ti notifica tempestivamente un reclamo legale, non dovrai risarcire la società per i danni che avresti potuto evitare o ridurre con un preavviso tempestivo. \nAccetti che la società possa controllare procedimenti di indagine, difesa e risoluzione dei reclami legali per i quali dovresti risarcire la società e ti impegni a sostenere tali sforzi. La società si impegna a non accettare alcun accordo che attribuisca la colpa all'utente o gli imponga obblighi senza il suo previo consenso.\n\n<h2 id=\"heading--disclaimers\"><a href=\"#heading--disclaimers\">Scarico di responsabilità</a></h2>\n\n***Accetti tutti i rischi derivanti dall'utilizzo del forum e dei suoi contenuti. Nella misura consentita dalla legge, la società e i suoi fornitori forniscono il forum così com'è, senza alcuna garanzia.***\n\nIl forum può creare collegamenti ipertestuali e integrare forum e servizi gestiti da altri. La società non fornisce alcuna garanzia sui servizi gestiti da altri o sui contenuti che possono fornire. L'utilizzo di servizi gestiti da altri può essere regolato da altri termini vigenti tra l'utente e il responsabile della gestione del servizio in questione.\n\n<h2 id=\"heading--liability\"><a href=\"#heading--liability\">Limitazioni di responsabilità</a></h2>\n\n***Né la società né i suoi fornitori saranno responsabili nei tuoi confronti per danni derivanti da violazioni del contratto che il loro personale non avrebbe potuto ragionevolmente prevedere quando hai accettato questi termini.***\n\n***Nella misura consentita dalla legge, la responsabilità totale nei confronti dell'utente per reclami di qualsiasi tipo relativi al forum o ai contenuti sul forum sarà limitata a $50.***\n\n<h2 id=\"heading--feedback\"><a href=\"#heading--feedback\">Feedback</a></h2>\n\nLa società accoglie con favore feedback e suggerimenti per il forum. Consulta la successiva sezione [Contatti](#heading--contact) per trovare il modo di contattarci.\n\nAccetti che la società possa liberamente agire in base al feedback e ai suggerimenti che fornisci senza che la società debba informarti dell'uso del tuo feedback, né ottenere il tuo permesso di usarlo o pagarti. Accetti di non inviare commenti o suggerimenti che possano essere riservati o proprietari per te o per altri.*\n\n<h2 id=\"heading--termination\"><a href=\"#heading--termination\">Conclusione del contratto</a></h2>\n\nL'utente o la società possono porre fine all'accordo descritto nei presenti termini in qualsiasi momento. Alla scadenza dell'accordo, termina anche il tuo permesso di utilizzare il forum.\n\nLe disposizioni contenute nelle seguenti sezioni sopravvivono alla fine del nostro accordo: [I tuoi contenuti](#heading--your-contenti), [Feedback](#heading--feedback), [Le tue responsabilità](#heading--responsibility), [Scarico di responsabilità](#heading--disclaimers), [Limitazioni delle responsabilità](#heading--liability) e [Termini generali](#heading-general).\n\n<h2 id=\"heading--disputes\"><a href=\"#heading--disputes\">Controversie</a></h2>\n\n%{governing_law} sarà competente a decidere su qualsiasi controversia relativa ai presenti termini o all'utilizzo del forum da parte tua.\n\nL'utente e la società si impegnano a richiedere pronunce giudiziarie su questioni relative ai presenti termini solo in tribunali statali o federali in %{city_for_disputes}. Né l'utente né la società presenteranno opposizione alla giurisdizione, al forum o alla sede in tali tribunali.\n\n***Prima di richiedere pronunce giudiziarie ai sensi del Computer Fraud and Abuse Act, l'utente e la società tenteranno di risolvere eventuali controversie richiedendo un procedimento arbitrale all'American Arbitration Association. Il procedimento arbitrale seguirà le norme delle Commercial Arbitration Rules and Supplementary Procedures for Consumer Related Disputes dell'AAA. Il procedimento arbitrale si svolgerà in %{city_for_disputes}. Ti impegni a risolvere eventuali controversie individualmente e non nell'ambito di class action o di altri procedimenti legali collettivi, sia in qualità di soggetto ricorrente che come membro di un gruppo collettivo. Nessun membro della commissione giudicante potrà unire il procedimento relativo a una controversia con altri procedimenti arbitrali senza il permesso della società.***\n\nOgni lodo arbitrale comprenderà i costi procedimentali, spese legali e costi per i testimoni ragionevoli. L'utente e la società possono partecipare a lodi arbitrali in qualsiasi tribunale competente.\n\n<h2 id=\"heading--general\"><a href=\"#heading--general\">Termini generali</a></h2>\n\nSe una qualsiasi disposizione dei presenti termini non risulta legalmente applicabile nella forma in cui è scritta, ma potrebbe essere modificata per diventare applicabile, la disposizione in questione dovrà essere modificata nella misura minima necessaria per renderla applicabile. In caso contrario, tale disposizione dovrà essere eliminata.\n\nNon puoi assegnare il tuo contratto con la società a terzi. La società può assegnare il tuo contratto a qualsiasi società affiliata, a qualsiasi altra società che ottenga il controllo della società o che acquisti le risorse della società relative al forum. Qualsiasi tentativo di assegnare il contratto in violazione dei presenti termini non ha alcun valore legale.\n\nL'esercizio di specifici diritti ai sensi del presente Contratto e la rinuncia alla rivalsa in caso di particolari violazioni al presente Contratto non implicano la rinuncia a qualsiasi rivalsa in caso di altre violazioni al presente Contratto.\n\nI presenti termini contengono tutte le condizioni dell'accordo tra l'utente e la società sull'uso del forum. I presenti termini sostituiscono completamente qualsiasi altro accordo sull'utilizzo del forum da parte dell'utente, esistente in forma scritta o meno.\n\n<h2 id=\"heading--contact\"><a href=\"#heading--contact\">Contatti</a></h2>\n\nPuoi inviare notifiche alla società ai sensi dei presenti termini e fare domande all'indirizzo <%{contact_email}>.\n\nLa società può inviarti notifiche ai sensi dei presenti termini utilizzando l'indirizzo e-mail che hai fornito per registrare il tuo account sul forum, oppure pubblicando un messaggio sulla homepage del forum o ancora sulla pagina del tuo account.\n\n<h2 id=\"heading--changes\"><a href=\"#heading--changes\">Modifiche</a></h2>\n\nL'ultimo aggiornamento dei presenti termini da parte della società risale al 12 luglio 2018 e altri aggiornamenti potranno essere applicati in futuro.. La società pubblica tutti gli aggiornamenti sul forum. Per gli aggiornamenti che contengono modifiche sostanziali, la società si impegna a inviare un'e-mail agli utenti che hanno creato un account e hanno fornito un indirizzo e-mail valido. La società può anche annunciare aggiornamenti con messaggi o avvisi speciali sul forum.\n\nQuando ricevi la notifica di un aggiornamento ai presenti termini, dovrai accettare i nuovi termini per continuare a utilizzare il forum.\n"
   privacy_topic:
     title: "Informativa sulla privacy"
     body: |
@@ -3524,6 +3594,9 @@ it:
     mass_award:
       errors:
         invalid_csv: Si è verificato un errore sulla riga %{line_number}. Si prega di confermare che il CSV ha un'email per riga.
+        too_many_csv_entries: Troppi elementi nel file CSV. Usa un file CSV con non più di %{count} elementi.
+        badge_disabled: Attivare prima il distintivo %{badge_name} .
+        cant_grant_multiple_times: Impossibile assegnare il distintivo %{badge_name} più volte a uno stesso utente.
     editor:
       name: Redattore
       description: Prima modifica ad un messaggio
@@ -3538,14 +3611,14 @@ it:
       name: Base
       description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">Può utilizzare</a> tutte le funzioni essenziali della comunità
       long_description: |
-        Questo distintivo è assegnato quando si raggiunge il livello di di attendibilità1. Grazie per essere rimasto nei paraggi e per aver letto alcune discussioni, per capire meglio di cosa si occupa la nostra comunità. Le limitazioni imposte ai nuovi utenti sono state rimosse, e ti sono state attivate alcune funzioni essenziali come l'invio di messaggi personali, la segnalazione di messaggi sospetti, la possibilità di modificare gli argomenti Wiki e l'abilità di inviare immagini e collegamenti multipli.
+        Questo distintivo è assegnato quando si raggiunge il livello di attendibilità 1. Grazie per essere rimasto nei paraggi e per aver letto alcune discussioni, per capire meglio di cosa si occupa la nostra comunità. Le limitazioni imposte ai nuovi utenti sono state rimosse, e ti sono state attivate alcune funzioni essenziali come l'invio di messaggi personali, la segnalazione di messaggi sospetti, la possibilità di modificare gli argomenti Wiki e l'abilità di inviare immagini e collegamenti multipli.
     member:
       name: Membro
       description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">Può utilizzare</a> inviti, messaggi di gruppo e mettere più "mi piace"
       long_description: |
         Questo distintivo è assegnato quando si raggiunge il livello di attendibilità 2. Grazie per esserti unito e per aver partecipato per qualche settimana alla nostra comunità. Ora puoi mandare inviti dalla tua pagina utente o dai singoli argomenti, creare messaggi personali di gruppo, e mettere un numero maggiore di "Mi piace" al giorno.
     regular:
-      name: Assiduo
+      name: Abituale
       description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">Può utilizzare</a> opzioni come cambio categoria, rinomina, seguire link, usare wiki e mettere ancora più "mi piace"
       long_description: |
         Questo distintivo viene assegnato quando raggiungi il livello di attendibilità 3. Grazie per essere stato parte attiva della nostra comunità per qualche mese. Ora sei uno dei lettori più attivi e un collaboratore affidabile che rende grande la nostra comunità. Ora puoi cambiare categorie e rinominare gli argomenti, usare le segnalazioni spam più potenti, accedere a un'area Lounge privata e puoi mettere un numero maggiore di "Mi piace" al giorno.
@@ -3764,7 +3837,7 @@ it:
       description: Presente per 365 giorni consecutivi
       long_description: |
         Questo distintivo è assegnato per aver visitato il sito per 365 giorni consecutivi. Wow, un intero anno!
-    badge_title_metadata: "%{display_name}distintivo su %{site_title}"
+    badge_title_metadata: "distintivo %{display_name} su %{site_title}"
   admin_login:
     success: "Email inviata"
     errors:
@@ -3793,6 +3866,9 @@ it:
         other: '"%{tag_name}" è limitato alle seguenti categorie: %{category_names}'
       synonym: 'I sinonimi non sono ammessi. Utilizza invece "%{tag_name}".'
       has_synonyms: '"%{tag_name}" non può essere utilizzato perché ha dei sinonimi.'
+    required_tags_from_group:
+      one: "Devi includere almeno %{count} etichetta %{tag_group_name}. Le etichette in questo gruppo sono: %{tags}."
+      other: "Devi includere almeno %{count} etichette %{tag_group_name}. Le etichette in questo gruppo sono: %{tags}."
     invalid_target_tag: "non può essere sinonimo di un sinonimo"
     synonyms_exist: "non è consentito finché esistono sinonimi"
   rss_by_tag: "Argomenti etichettati %{tag}"
@@ -4004,6 +4080,7 @@ it:
       new_topics_unless_trust_level: "Gli Argomenti di utenti con basso livello di attendibilità devono essere approvati dallo staff. Vedi `approve_new_topics_unless_trust_level`."
       fast_typer: "Il nuovo utente ha digitato il suo primo messaggio in modo sospettosamente rapido, sembrerebbe il comportamento di un bot o di uno spammer. Vedi `min_first_post_typing_time`."
       auto_silence_regexp: "Nuovo utente il cui primo post corrisponde all'impostazione `auto_silence_first_post_regex`."
+      watched_word: "Questo messaggio include una parola osservata. Guarda il tuo <a href='%{base_url}/admin/customize/watched_words'>elenco di parole osservate</a> ."
       staged: "Nuovi argomenti e messaggi per gli Utenti Temporanei devono essere approvati dallo staff. Vedi `approve_unless_staged`."
       category: "I post in questa Categoria richiedono l'approvazione manuale da parte dello staff. Vedi le impostazioni della categoria."
       must_approve_users: "Tutti i nuovi utenti devono essere approvati dallo staff. Vedi 'must_approve_users'."
@@ -4012,6 +4089,7 @@ it:
       email_spam: "Questa email è stata contrassegnata come spam dall'intestazione definita in `email_in_spam_header`."
       suspect_user: "Questo nuovo utente ha inserito le informazioni del profilo senza leggere alcun argomento o messaggio, il che suggerisce fortemente che potrebbe essere uno spammer. Vedi `approve_suspect_users`."
       contains_media: "Questo post include i contenuti multimediali incorporati. Vedi `review_media_unless_trust_level`."
+      queued_by_staff: "Un membro dello staff pensa che questo messaggio debba essere rivisto. Rimarrà nascosto fino ad allora."
     actions:
       agree:
         title: "Acconsenti..."
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index c1cf14266d..8f16bafd8c 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -126,7 +126,7 @@ ja:
         unsubscribe_not_allowed: "このユーザーがメール経由で購読を解除できない場合に発生します。"
         email_not_allowed: "メールリストがホワイトリストにないか、ブラックリストに含まれている場合に発生します。"
       unrecognized_error: "不明なエラー"
-    secure_media_placeholder: "編集済み: このサイトではセキュリティで保護されたメディアが有効になってインす。トピックにアクセスしたり、「メディアを表示」をクリックすると、添付されたメディアが表示されます。"
+    secure_media_placeholder: "編集済み: このサイトではセキュリティで保護されたメディアが有効になっています。トピックにアクセスしたり、「メディアを表示」をクリックすると、添付されたメディアが表示されます。"
     view_redacted_media: "メディアを表示"
   errors: &errors
     format: ! "%{attribute} %{message}"
@@ -172,7 +172,7 @@ ja:
       wrong_length:
         other: は %{count} 文字である必要があります
       other_than: "は %{count} 以外の値である必要があります"
-      auth_overrides_username: "'auth_overrides_username` 設定が有奥であるため、認証サービスプロバイダー側でユーザー名を更新する必要があります。"
+      auth_overrides_username: "'auth_overrides_username` 設定が有効であるため、認証サービスプロバイダー側でユーザー名を更新する必要があります。"
     template:
       body: ! "次のフィールドに問題があります:"
       header:
@@ -212,13 +212,13 @@ ja:
     not_found_json: "招待トークンが無効です。スタッフにお問い合わせください。"
     not_matching_email: "あなたのメールアドレスと招待トークンに関連付けられたメールアドレスが一致しません。スタッフにお問い合わせください。"
     not_found_template: |
-      <p><a href="%{base_url}">%{site_name}</a> への招待はすでに承諾されています。</p>
+      <p><a href="%{base_url}">%{site_name}</a> への招待はすでに引き換えられています。</p>
 
       <p>パスワードを覚えている場合は、<a href="%{base_url}/login">ログイン</a>してください。</p>
 
       <p>そうでない場合は、<a href="%{base_url}/password-reset">パスワードをリセット</a>してください。</p>
     not_found_template_link: |
-      <p><a href="%{base_url}">%{site_name}</a> への招待状は承諾できなくなりました。あなたを招待した人に新しい招待状を送るようリクエストしてください。</p>
+      <p><a href="%{base_url}">%{site_name}</a> への招待を引き換えられなくなりました。あなたを招待した人に新しい招待状を送るようリクエストしてください。</p>
     user_exists: "<b>%{email}</b> を招待する必要はありません。 <a href='%{base_path}/u/%{username}/summary'> のアカウントはすでに存在します！</a>"
     invite_exists: "<b>%{email}</b> はすでに招待済みです。"
     invalid_email: "%{email} は有効なメールアドレスではありません。"
@@ -242,7 +242,7 @@ ja:
     user_exists: "そのユーザーはすでに招待されています。ユーザーを一度しかトピックに招待できません。"
     muted_invitee: "そのユーザーはあなたをミュートしています。"
     muted_topic: "そのユーザーはこのトピックをミュートしています。"
-    receiver_does_not_allow_pm: "そのユーザーは、あなたが非公開メッセージを送信することを許可していません。"
+    receiver_does_not_allow_pm: "そのユーザーは、あなたがプライベートメッセージを送信することを許可していません。"
     sender_does_not_allow_pm: "そのユーザーがプライベートメッセージを送信することを許可していません。"
     user_cannot_see_topic: "%{username} はトピックを閲覧できません。"
   backup:
@@ -281,7 +281,7 @@ ja:
     continue: "ディスカッションを続行"
     error: "埋め込みエラー"
     referer: "リファラー:"
-    error_topics: "`トピックリストの埋め込み` サイト設定が有効になっていませんでした"
+    error_topics: "`embed topics list` サイト設定が有効になっていませんでした"
     mismatch: "リファラーが送信されなかったか、次のいずれのホストにも一致しませんでした:"
     no_hosts: "埋め込み用のホストは設定されていません。"
     configure: "埋め込みを構成"
@@ -303,7 +303,7 @@ ja:
     other: "投稿につき %{count} 人のユーザーしかメンションできません。"
   no_mentions_allowed_newuser: "新規ユーザーは他のユーザーをメンションできません。"
   too_many_mentions_newuser:
-    other: "新規ユーザーは投稿に就き %{count} 人のユーザーしかメンションできません。"
+    other: "新規ユーザーは投稿につき %{count} 人のユーザーしかメンションできません。"
   no_embedded_media_allowed_trust: "投稿にメディア項目を埋め込むことはできません。"
   no_embedded_media_allowed: "新規ユーザーは投稿にメディア項目を埋め込むことはできません。"
   too_many_embedded_media:
@@ -326,7 +326,7 @@ ja:
   removed_direct_reply_full_quotes: "以前の投稿全体の引用を自動的に削除しました。"
   watched_words_auto_tag: "自動的にタグ付けされたトピック"
   secure_upload_not_allowed_in_public_topic: "次のセキュアアップロードを公開トピックで使用することはできません: %{upload_filenames}"
-  create_pm_on_existing_topic: "既存のトピックに PM を作成することはできません。"
+  create_pm_on_existing_topic: "既存のトピックで PM を作成することはできません。"
   slow_mode_enabled: "このトピックは低速モードです。"
   just_posted_that: "は最近の投稿に非常に似ています"
   invalid_characters: "に無効な文字が含まれています"
@@ -427,7 +427,7 @@ ja:
 
       - どのようなユーザーが興味を持ちますか？なぜ重要ですか？どのような回答を求めていますか？
 
-      - 一般的にしよされている言葉をトピックに含めると、ほかのユーザーが*検索*しやすくなります。トピックを関連トピックとグループ化するには、カテゴリ（またはタグ）を選択してください。
+      - 一般的に使用されている言葉をトピックに含めると、ほかのユーザーが*検索*しやすくなります。トピックを関連トピックとグループ化するには、カテゴリ (またはタグ) を選択してください。
 
       詳細については、[コミュニティガイドラインをご覧ください](%{base_path}/guidelines)。このパネルは最初の%{education_posts_text}にのみ表示されます。
     "new-reply": |
@@ -533,7 +533,7 @@ ja:
         user_email:
           attributes:
             user_id:
-              reassigning_primary_email: "プライマリメールを別のユーザーに割り当て直すことはできません。"
+              reassigning_primary_email: "プライマリーメールを別のユーザーに割り当て直すことはできません。"
         color_scheme_color:
           attributes:
             hex:
@@ -544,7 +544,7 @@ ja:
         web_hook:
           attributes:
             payload_url:
-              invalid: "URL が無効です。URL には http:// または https:// が含まれている必要があります。また空白にすることはできません。"
+              invalid: "URL が無効です。URL には http:// または https:// が含まれている必要があります。また空にすることはできません。"
         custom_emoji:
           attributes:
             name:
@@ -660,7 +660,10 @@ ja:
       pms_per_day: "1 日に作成できるメッセージの上限に達しました。%{time_left}後に新しいメッセージを作成できるようになります。"
       create_like: "わぉ！愛をたくさん分かち合っていますね！今日の「いいね！」の上限に達しました。信頼レベルが高くなると、1 日に「いいね！」できる上限が高くなります。%{time_left}経ったら、また投稿に「いいね！」できるようになります。"
       create_bookmark: "1 日のブックマークの上限に達しました。%{time_left}経ってから、ブックマークを設定してください。"
+      edit_post: "1 日に編集できる回数の上限に達しました。%{time_left}経ってから、編集を送信してください。"
+      live_post_counts: "ライブ投稿の件数を短時間で尋ねています。%{time_left}経ってから、もう一度お試しください。"
       unsubscribe_via_email: "メールでの購読解除数の上限に達しました。%{time_left}経ってからもう一度お試しください。"
+      topic_invitations_per_day: "トピック招待数の上限に達しました。%{time_left}経ってから、招待を送信してください。"
     hours:
       other: "%{count} 時間"
     minutes:
@@ -758,11 +761,30 @@ ja:
       windows: "Microsoft Windows"
       unknown: "不明なオペレーティングシステム"
   change_email:
+    wrong_account_error: "間違ったアカウントにログインしています。ログアウトして、もう一度お試しください。"
     confirmed: "メールアドレスが更新されました。"
     please_continue: "%{site_name} に進む"
     error: "メールアドレスの変更中にエラーが発生しました。このアドレスはすでに使われている可能性があります。"
+    doesnt_exist: "そのメールアドレスは、あなたのアカウントに関連付けられていません。"
     error_staged: "メールアドレスの変更中にエラーが発生しました。このアドレスはすでにステージングユーザーに使われている可能性があります。"
     already_done: "この確認リンクは有効ではありません。すでにメールアドレスが変更されている可能性があります。"
+    confirm: "確認"
+    max_secondary_emails_error: "セカンダリメールアドレスの上限に達しました。"
+    authorizing_new:
+      title: "新しいメールの確認"
+      description: "メールアドレスを次のように変更することを確認してください:"
+      description_add: "代替メールアドレスを追加することを確認してください:"
+    authorizing_old:
+      title: "メールアドレスの変更"
+      description: "メールアドレスの変更を確認してください"
+      description_add: "代替メールアドレスを追加することを確認してください:"
+      old_email: "古いメール: %{email}"
+      new_email: "新しいメール: %{email}"
+      almost_done_title: "新しいメールアドレスの確認"
+      almost_done_description: "新しいメールアドレスに変更を確認するためのメールを送信しました！"
+  associated_accounts:
+    revoke_failed: "%{provider_name} のアカウントを取り消せませんでした。"
+    connected: "(接続済み)"
   activation:
     action: "クリックしてアカウントを確認する"
     already_done: "このアカウントの確認リンクは無効です。すでにアカウントがアクティブになっている可能性があります。"
@@ -774,6 +796,10 @@ ja:
     activated: "このアカウントはすでに確認済みです。"
     admin_confirm:
       title: "管理者アカウントの確認"
+      description: "<b>%{target_username} (%{target_email})</b> を管理者にしてもよろしいですか？"
+      grant: "管理者アクセスを付与"
+      complete: "<b>%{target_username}</b> は管理者になりました。"
+      back_to: "%{title} に戻る"
   reviewable_score_types:
     needs_approval:
       title: "承認待ち"
@@ -790,6 +816,8 @@ ja:
       email_body: "%{link}\n\n%{message}"
     inappropriate:
       title: "不適切"
+      description: 'この投稿には一般的な人が攻撃的、虐待的、または<a href="%{base_path}/guidelines">コミュニティガイドライン</a>に違反すると見なすコンテンツが含まれています。'
+      short_description: '<a href="%{base_path}/guidelines">コミュニティガイドライン</a>の違反'
     notify_user:
       title: "@%{username} にメッセージを送る"
       description: "この投稿についてこのユーザーと直接話すことを希望します。"
@@ -800,6 +828,7 @@ ja:
       title: "その他"
       description: "この投稿は上記以外の理由でスタッフの注意が必要です。"
       short_description: "その他の理由でスタッフの注意が必要"
+      email_title: '"%{title}" の投稿にはスタッフの注意が必要です'
       email_body: "%{link}\n\n%{message}"
     bookmark:
       title: "ブックマーク"
@@ -809,12 +838,20 @@ ja:
       title: "いいね！"
       description: "この投稿を「いいね！」する"
       short_description: "この投稿を「いいね！」する"
+  draft:
+    sequence_conflict_error:
+      title: "下書きエラー"
+      description: "下書きは別のウィンドウで編集されています。このページを再読み込みしてください。"
+  draft_backup:
+    pm_title: "進行中のトピックのバックアップ下書き"
+    pm_body: "バックアップの下書きを含むトピック"
   user_activity:
     no_default:
       self: "まだアクティビティがありません。"
       others: "アクティビティがありません。"
     no_bookmarks:
       self: "ブックマークした投稿はありません。ブックマークを使用すると、特定の投稿を素早く参照できます。"
+      search: "指定された検索クエリでブックマークは見つかりませんでした。"
       others: "ブックマークはありません。"
     no_likes_given:
       self: "「いいね！」した投稿はありません。"
@@ -822,8 +859,29 @@ ja:
     no_replies:
       self: "まだ投稿に返信していません。"
       others: "返信はありません。"
+    no_drafts:
+      self: "下書きはありません。トピックで返信の作成を始めると、新しい下書きとして自動保存されます。"
+  email_settings:
+    pop3_authentication_error: "指定された POP3 の資格情報に問題がありました。ユーザー名とパスワードを確認して、もう一度お試しください。"
+    imap_authentication_error: "指定された IMAP の資格情報に問題がありました。ユーザー名とパスワードを確認して、もう一度お試しください。"
+    imap_no_response_error: "IMAP サーバーとの通信中にエラーが発生しました。%{message}"
+    smtp_authentication_error: "指定された SMTP の資格情報に問題がありました。ユーザー名とパスワードを確認して、もう一度お試しください。"
+    authentication_error_gmail_app_password: 'アプリケーション固有のパスワードが必要です。<a target="_blank" href="https://support.google.com/accounts/answer/185833">こちらの Google ヘルプ記事</a>をご覧ください。'
+    smtp_server_busy_error: "SMTP サーバーは現在ビジー状態です。後でもう一度お試しください。"
+    smtp_unhandled_error: "SMTP サーバーとの通信中に未処理のエラーが発生しました。%{message}"
+    imap_unhandled_error: "IMAP サーバーとの通信中に未処理のエラーが発生しました。%{message}"
+    connection_error: "サーバーとの接続に問題が発生しました。サーバー名とポートを確認して、もう一度お試しください。"
+    timeout_error: "サーバーへの接続がタイムアウトしました。サーバー名とポートを確認して、もう一度お試しください。"
+    unhandled_error: "メールの設定をテスト中に未処理のエラーが発生しました。%{message}"
   webauthn:
     validation:
+      invalid_type_error: "指定された webauthn タイプが無効です。有効なタイプは webauthn.get と webauthn.create です。"
+      challenge_mismatch_error: "指定されたチャレンジは認証サーバーが生成したチャレンジに一致しません。"
+      invalid_origin_error: "認証リクエストの発信元がサーバーの発信元と一致しません。"
+      malformed_attestation_error: "認証データのデコード中にエラーが発生しました。"
+      invalid_relying_party_id_error: "認証リクエストの依拠当事者 ID がサーバーの依拠当事者 ID と一致しません。"
+      user_verification_error: "ユーザー確認が必要です。"
+      unsupported_public_key_algorithm_error: "指定された公開鍵アルゴリズムはサーバーでサポートされていません。"
       unsupported_attestation_format_error: "この認証形式はサーバーでサポートされていません。"
       credential_id_in_use_error: "入力された資格情報 ID はすでに使用されています。"
       public_key_error: "資格情報の公開鍵の確認に失敗しました。"
@@ -912,7 +970,7 @@ ja:
       read: "すべて読み取る"
       write: "すべて書き込み"
       one_time_password: "ワンタイムログイントークンの作成"
-      bookmarks_calendar: "ブックマークのリマインダーの読み取り"
+      bookmarks_calendar: "ブックマークリマインダーの読み取り"
     invalid_public_key: "公開鍵は無効です。"
     invalid_auth_redirect: "この auth_redirect ホストは許可されていません。"
     invalid_token: "欠落しているか、無効または期限切れのトークンです。"
@@ -931,7 +989,7 @@ ja:
         edited_at: 日付
         post: 投稿
         editor: 編集者
-        author: 作者
+        author: 作成者
         edit_reason: 理由
       description: "新しい投稿の編集回数。"
     user_flagging_ratio:
@@ -966,39 +1024,70 @@ ja:
         assigned: 割り当て済み
         poster: 投稿者
         flagger: 通報者
+        time_to_resolution: 解決時間
+      description: "通報の種類、投稿者、通報者、および解決までの時間など、通報のステータスのリスト。"
     visits:
       title: "ユーザーアクセス"
       xaxis: "日"
       yaxis: "アクセス数"
+      description: "すべてのユーザー訪問数"
     signups:
       title: "登録"
       xaxis: "日"
       yaxis: "登録数"
+      description: "この期間の新規アカウント登録。"
     new_contributors:
+      title: "新しい貢献者"
       xaxis: "日"
+      yaxis: "新しい貢献者数"
+      description: "この期間に初めて投稿したユーザーの数。"
     trust_level_growth:
+      title: "信頼レベルの増加"
+      xaxis:
+        tl1_reached: "TL1 に達した"
+        tl2_reached: "TL2 に達した"
+        tl3_reached: "TL3 に達した"
+        tl4_reached: "TL4 に達した"
       yaxis: "日"
+      description: "この期間に信頼レベルが上がったユーザーの数。"
     consolidated_page_views:
+      title: "統合ページビュー"
+      xaxis:
+        page_view_crawler: "クローラー"
+        page_view_anon: "匿名ユーザー"
+        page_view_logged_in: "ログインユーザー"
       yaxis: "日"
+      description: "ログインユーザー、匿名ユーザー、およびクローラーのページビュー。"
       labels:
         post: 投稿
         editor: 編集者
+        author: 作者
         edit_reason: 理由
     dau_by_mau:
+      title: "DAU/MAU"
       xaxis: "日"
+      yaxis: "DAU/MAU"
+      description: "前日にログインしたメンバーの数を先月にログインしたメンバーの数で割った数 - コミュニティの「粘着性」を示す割合 % を返します。30% 以上を目指してください。"
     daily_engaged_users:
+      title: "1 日のエンゲージユーザー"
       xaxis: "日"
+      yaxis: "エンゲージユーザー"
+      description: "前日に「いいね！」または投稿したユーザーの数。"
     profile_views:
+      title: "ユーザープロフィールビュー"
       xaxis: "日"
       yaxis: "ユーザープロフィールの閲覧数"
+      description: "ユーザープロフィールの新しいビューの合計。"
     topics:
       title: "トピック"
       xaxis: "日"
       yaxis: "新しいトピックの数"
+      description: "この期間に作成された新しいトピック。"
     posts:
       title: "投稿"
       xaxis: "日"
       yaxis: "新しい投稿の数"
+      description: "この期間に作成された新しい投稿"
     likes:
       title: "いいね！"
       xaxis: "日"
@@ -1008,15 +1097,22 @@ ja:
       title: "通報"
       xaxis: "日"
       yaxis: "通報の数"
+      description: "新しい通報の数"
     bookmarks:
       title: "ブックマーク"
       xaxis: "日"
       yaxis: "新しいブックマークの数"
+      description: "ブックマークされた新しいトピックと投稿の数。"
     users_by_trust_level:
       title: "信頼レベル別ユーザー"
       xaxis: "信頼レベル"
       yaxis: "ユーザー数"
+      labels:
+        level: レベル
+      description: "信頼レベル別のユーザー数。"
+      description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
+      title: "タイプ別ユーザー数"
       xaxis: "タイプ"
       yaxis: "ユーザー数"
       labels:
@@ -1025,28 +1121,45 @@ ja:
         admin: 管理者
         moderator: モデレーター
         suspended: 凍結中
+        silenced: 投稿禁止
+      description: "管理者、モデレーター、凍結、および投稿禁止別ユーザー数。"
+    trending_search:
+      title: トレンド検索語
+      labels:
+        term: 用語
+        searches: 検索数
+        click_through: CTR
+      description: "クリックスルー率による最も人気の高い検索語。"
     emails:
       title: "送信されたメール"
       xaxis: "日"
       yaxis: "メール件数"
+      description: "送信された新しいメールの数。"
     user_to_user_private_messages:
+      title: "ユーザー間 (返信を除く)"
       xaxis: "日"
       yaxis: "メッセージ件数"
+      description: "新たに開始された個人メッセージの数。"
     user_to_user_private_messages_with_replies:
+      title: "ユーザー間 (返信あり)"
       xaxis: "日"
       yaxis: "メッセージ件数"
+      description: "すべての新しい個人メッセージと応答の数。"
     system_private_messages:
       title: "システム"
       xaxis: "日"
       yaxis: "メッセージ件数"
+      description: "システムによって自動送信された個人メッセージの数。"
     moderator_warning_private_messages:
       title: "モデレーター警告"
       xaxis: "日"
       yaxis: "メッセージ件数"
+      description: "モデレーターからの個人メッセージで送信された警告の数。"
     notify_moderators_private_messages:
       title: "管理人に通知"
       xaxis: "日"
       yaxis: "メッセージ件数"
+      description: "モデレーターが通報によって非公開に通知された回数。"
     notify_user_private_messages:
       title: "ユーザーに通知"
       xaxis: "日"
@@ -1173,20 +1286,20 @@ ja:
         login_at: ログイン日時
       description: "管理者のログイン時間と場所のリスト。"
     top_uploads:
-      title: "上位アップロード"
+      title: "トップアップロード"
       labels:
         filename: ファイル名
-        extension: 拡張
-        author: 作者
+        extension: 拡張子
+        author: 作成者
         filesize: ファイルサイズ
-      description: "すべてのアップロードを拡張し、ファイルサイズ、および作者別に一覧表示します。"
+      description: "すべてのアップロードを拡張子、ファイルサイズ、および作成者別に一覧表示します。"
     top_ignored_users:
-      title: "上位無視/ミュートユーザー"
+      title: "トップ無視/ミュートユーザー"
       labels:
         ignored_user: 無視されたユーザー
         ignores_count: 無視数
         mutes_count: ミュート数
-      description: "他多数のユーザーによってミュートまたは無視されたユーザー。"
+      description: "多数のユーザーによってミュートまたは無視されたユーザー。"
   dashboard:
     rails_env_warning: "サーバーは %{env} モードで実行中です。"
     host_names_warning: "現在 config/database.yml ファイルは、デフォルトの localhost をホスト名として使用しています。あなたのサイトのホスト名に更新してください。"
@@ -1197,8 +1310,8 @@ ja:
     facebook_config_warning: 'サーバーは Facebook を使った登録とログインを許可 (enable_facebook_logins) するように構成されていますが、アプリ ID とアプリシークレットの値が設定されていません。<a href="%{base_path}/admin/site_settings">サイト設定</a>に移動して、設定を更新してください。<a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">詳しくは、こちらのガイドをご覧ください</a>。'
     twitter_config_warning: 'サーバーは Twitter を使った登録とログインを許可 (enable_twitter_logins) するように構成されていますが、キーとシークレットの値が設定されていません。<a href="%{base_path}/admin/site_settings">サイト設定</a>に移動して、設定を更新してください。<a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">詳しくは、こちらのガイドをご覧ください</a>。'
     github_config_warning: 'サーバーは GitHub を使った登録とログインを許可 (enable_github_logins) するように構成されていますが、クライアント ID とシークレットの値が設定されていません。<a href="%{base_path}/admin/site_settings">サイト設定</a>に移動して、設定を更新してください。<a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">詳しくは、こちらのガイドをご覧ください</a>。'
-    s3_config_warning: 'サーバーはファイルを S3 にアップロードするように構成されていますが、少なくとも次の設定の 1 が設定されていません: s3_access_key_id、s3_secret_access_key、s3_use_iam_profile、または s3_upload_bucket。<a href="%{base_path}/admin/site_settings">サイト設定</a>に移動して設定を更新してください。<a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">詳しくは、「S3 への画像アップロードを設定する方法」をご覧ください</a>。'
-    s3_backup_config_warning: 'サーバーはバックアップを S3 にアップロードするように構成されていますが、少なくとも次の設定の 1 が設定されていません: s3_access_key_id、s3_secret_access_key、s3_use_iam_profile、または s3_backup_bucket。<a href="%{base_path}/admin/site_settings">サイト設定</a>に移動して設定を更新してください。<a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">詳しくは、「S3 への画像アップロードを設定する方法」をご覧ください</a>。'
+    s3_config_warning: 'サーバーはファイルを S3 にアップロードするように構成されていますが、少なくとも次の設定の 1 つが設定されていません: s3_access_key_id、s3_secret_access_key、s3_use_iam_profile、または s3_upload_bucket。<a href="%{base_path}/admin/site_settings">サイト設定</a>に移動して設定を更新してください。<a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">詳しくは、「S3 への画像アップロードを設定する方法」をご覧ください</a>。'
+    s3_backup_config_warning: 'サーバーはバックアップを S3 にアップロードするように構成されていますが、少なくとも次の設定の 1 つが設定されていません: s3_access_key_id、s3_secret_access_key、s3_use_iam_profile、または s3_backup_bucket。<a href="%{base_path}/admin/site_settings">サイト設定</a>に移動して設定を更新してください。<a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">詳しくは、「S3 への画像アップロードを設定する方法」をご覧ください</a>。'
     s3_cdn_warning: 'サーバーはファイルを S3 にアップロードするように構成されていますが、S3 CDN が構成されていません。これにより、S3 のコストが高くなり、サイトパフォーマンスが低下する可能性があります。<a href="https://meta.discourse.org/t/-/148916" target="_blank">詳しくは、「アップロードにオブジェクトストレージを使用する」をご覧ください</a>。'
     image_magick_warning: 'サーバーは大きな画像のサムネイルを作成するように構成されていますが、ImageMagick がインストールされていません。パッケージマネージャーを使用して ImageMagick をインストールするか、<a href="https://www.imagemagick.org/script/download.php" target="_blank">最新リリースをダウンロード</a>してください。'
     failing_emails_warning: '失敗したメールジョブが %{num_failed_jobs} 件あります。app.yml を確認し、メールサーバーの設定が正しいことを確認してください。<a href="%{base_path}/sidekiq/retries" target="_blank">Sidekiq で失敗したジョブを参照</a>してください。'
@@ -1234,8 +1347,17 @@ ja:
     max_emojis_in_title: "トピックタイトルに許可される最大絵文字数"
     min_search_term_length: "有効な検索語の最小文字数"
     search_tokenize_chinese_japanese_korean: "CJK 以外のサイトでも強制検索で中国語/日本語/韓国語をトークン化する"
+    search_prefer_recent_posts: "大規模なフォーラムの検索が遅い場合、このオプションは先により直近の投稿のインデックスを試す"
+    search_recent_posts_size: "インデックスに保持する直近の投稿の数"
+    log_search_queries: "ユーザーが実行した検索クエリをログに記録する"
+    search_query_log_max_size: "保持する検索クエリの最大数"
+    search_query_log_max_retention_days: "検索クエリを保持する最大日数。"
+    search_ignore_accents: "テキストを検索する際にアクセントを無視する。"
+    category_search_priority_low_weight: "カテゴリの検索優先度が低いランキングに適用される重み。"
+    category_search_priority_high_weight: "カテゴリの検索優先度が高いランキングに適用される重み。"
     allow_uncategorized_topics: "カテゴリなしでトピックを作成することを許可する。警告: 未分類のトピックがある場合は、これをオフにする前に、カテゴリを設定する必要があります。"
     allow_duplicate_topic_titles: "トピックに同一の重複するタイトルを指定することを許可する。"
+    allow_duplicate_topic_titles_category: "カテゴリが異なる場合、同一の重複したタイトルを持つトピックを許可する。allow_duplicate_topic_titles は無効にする必要があります。"
     unique_posts_mins: "同じコンテンツを投稿できるまでの時間 (分)"
     educate_until_posts: "最初の (n) 件の新規投稿を入力し始めたときに、新規ユーザーチュートリアルのパネルをポップアップ表示します。"
     title: "title タグで使用される、このサイトの名前です。"
@@ -1248,31 +1370,72 @@ ja:
     download_remote_images_threshold: "リモート画像をダウンロードするために必要なディスクの最低空き容量 (パーセント表示)"
     disabled_image_download_domains: "これらのドメインのリモート画像をダウンロードしない (パイプ区切りのリスト)。"
     editing_grace_period: "投稿から (n) 秒間は、編集しても投稿履歴に新しいバージョンを作成しない。"
+    editing_grace_period_max_diff: "編集猶予期間で変更が許可される最大文字数。さらに変更された場合は別の投稿リビジョンを保存します (信頼レベル 0 および 1)"
+    editing_grace_period_max_diff_high_trust: "編集猶予期間で変更が許可される最大文字数。さらに変更された場合は別の投稿リビジョンを保存します (信頼レベル 2 以上 )"
+    staff_edit_locks_post: "スタッフメンバーが編集した投稿は編集できなくなります"
+    post_edit_time_limit: "TL0 または TL1 作者は投稿後 (n) 分間、投稿を編集できる。0 に設定すると永久に編集できます。"
+    tl2_post_edit_time_limit: "TL2 以上の作者は投稿後 (n) 分間、投稿を編集できる。0 に設定すると永久に編集できます。"
     edit_history_visible_to_public: "編集した投稿の前のバージョンをすべてのユーザーが閲覧することを許可する。無効である場合、スタッフメンバーのみが閲覧できます。"
     delete_removed_posts_after: "作者が削除した投稿は (n) 時間後に自動的に削除される。0 に設置すると、投稿は直ちに削除されます。"
     max_image_width: "投稿内のサムネイル画像の最大幅"
     max_image_height: "投稿内のサムネイル画像の最大高"
+    responsive_post_image_sizes: "ライトボックスのプレビュー画像のサイズを変更して、次のピクセル比の DPI の高いスクリーンを可能にします。レスポンシブ画像を無効にするには、すべての値を削除します。"
     fixed_category_positions: "オンにすると、カテゴリを固定された順に並べ替えられるようになります。オフにすると、アクティビティ順に並べ替えられます。"
     fixed_category_positions_on_create: "オンにすると、カテゴリの順序はトピック作成ダイアログで管理されるようになります (fixed_category_positions が必要)。"
     add_rel_nofollow_to_user_content: '内部リンク (親ドメインを含む) を除き、投稿されたすべてのユーザーコンテンツに rel nofollow を追加します。この設定を反映するには "rake posts:rebake" を実行してすべての投稿を作成し直す必要があります'
     exclude_rel_nofollow_domains: "nofollow をリンクに追加してはいけないドメインのリストです。 example.com は自動的に sub.example.com も許可します。少なくとも、ウェブクローラーがすべてのコンテンツを見つけやすくするために、このサイトのドメインを追加する必要があります。 ウェブサイトの一部がほかのドメイン上にある場合は、それらも追加してください。"
     post_excerpt_maxlength: "投稿の抜粋/要約の最大長。"
+    topic_excerpt_maxlength: "トピックの最初の投稿から生成されるトピックの抜粋/要約の最大の長さ。"
+    show_pinned_excerpt_mobile: "モバイルビューで固定トピックの抜粋を表示する。"
+    show_pinned_excerpt_desktop: "デスクトップビューで固定トピックの抜粋を表示する。"
     post_onebox_maxlength: "Discourse OneBox 投稿の最大文字数。"
+    blocked_onebox_domains: "ワンボックス化されないドメインのリスト。"
+    allowed_inline_onebox_domains: "タイトルなしでリンクされた場合、ミニチュア形式でワンボックス化されるドメインのリスト"
+    enable_inline_onebox_on_all_domains: "inline_onebox_domain_allowlist サイト設定を無視し、すべてのドメインでインラインのワンボックスを許可する。"
+    force_custom_user_agent_hosts: "すべてのリクエストでカスタムワンボックスユーザーエージェントを使用するホスト (特にユーザーエージェントごとにアクセスを制限するホストで役立ちます)。"
+    max_oneboxes_per_post: "投稿内のワンボックスの最大数。"
+    facebook_app_access_token: "Facebook アプリ ID とシークレットから生成されるトークン。Instagram ワンボックスを生成するために使用されます。"
     logo: "サイトの左上にあるロゴ画像です。高さ 120、縦横比 3：1を超える広幅の長方形の画像を使用してください。空白のままにすると、サイトタイトルのテキストが表示されます。"
     logo_small: "あなたのサイトの左上にある小さなロゴ画像です。下にスクロールしたときに見えます。 120×120 の正方形の画像を使用してください。空白のままにすると、ホームグリフが表示されます。"
     digest_logo: "サイトのメール要約の上部で使用されるロゴの代替画像です。広い長方形の画像を使用してください。SVG 画像を使わないでください。空白のままにすると、`logo` で設定した画像が使用されます。"
     mobile_logo: "あなたのサイトのモバイル版で使用されるロゴです。高さ120、縦横比 3：1 を超える広い長方形の画像を使用します。空白のままにすると、'logo' で設定した画像が使用されます。"
+    logo_dark: "'logo' サイト設定の代替のダークスキーム。"
+    logo_small_dark: "'logo small' サイト設定の代替のダークスキーム。"
+    mobile_logo_dark: "'mobile logo' サイト設定の代替のダークスキーム。"
+    large_icon: "ほかのメタデータアイコンのベースとして使用される画像。理想的には、512 x 512 より大きい必要があります。空のままにすると logo_small が使用されます。"
+    manifest_icon: "Android でロゴ/スプラッシュ画像として使用される画像。自動的に 512 × 512 にサイズ変更されます。空のままにすると、large_icon が使用されます。"
+    manifest_screenshots: "インストールプロンプトページでインスタンスの特徴と機能を紹介するスクリーンショット。すべての画像はローカルアップロードであり、同じサイズである必要があります。"
+    favicon: "サイトのファビコン。<a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a> をご覧ください。CDN で正しく動作させるには、png である必要があります。32 x 32 にサイズ変更されます。空のままにすると、large_icon が使用されます。"
+    apple_touch_icon: "Apple タッチデバイスに使用されるアイコン。自動的に 180x180 にサイズ変更されます。空のままにすると、large_icon が使用されます。"
+    opengraph_image: "デフォルトの opengraph 画像。ページにほかの適切な画像がない場合に使用されます。空のままにすると、large_icon が使用されます"
+    twitter_summary_large_image: "Twitter カードの 'summary large image' (幅 280 以上、高さ 150 以上である必要があります)。空のままにすると、opengraph_image を使って通常のカードメタデータが生成されます。"
     notification_email: "システムからの重要なメール送信に使用する from: メールアドレス。メールが届くように、ここに指定されたドメインは SPF、DKIM、逆引き PTR レコードが正しく設定されている必要があります。"
     email_custom_headers: "カスタムメールヘッダーのパイプ区切りのリスト"
+    email_subject: "標準メールのカスタマイズ可能な件名形式。<a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801</a> をご覧ください"
+    detailed_404: "特定のトピックにアクセスできない詳細な理由をユーザーに提供します。注意: URL が有効なトピックにリンクしているかどうかがユーザーにわかるため、安全性が低くなります。"
+    enforce_second_factor: "ユーザーが二要素認証を有効にするように強制します。すべてのユーザーに適用する場合は 'すべて' を選択します。スタッフユーザーのみに適用する場合は 'スタッフ' を選択します。"
+    force_https: "サイトが HTTPS のみを使用するように強制する。警告: HTTPS が完全にセットアップ済みであり、すべての場所で機能していることを確認するまで、これを有効にしないでください！CDN、すべてのソーシャルログイン、および外部ロゴ/依存関係がすべて HTTPS 対応であることを確認しましたか？"
+    same_site_cookies: "同じサイト Cookie を使用する。サポートされているブラウザですべてのクロスサイトリクエストフォージェリ攻撃を排除します (Lax または Strict)。Strict は、ログインと外部認証方式の使用を強制するサイトでのみ動作します。"
     summary_score_threshold: "「このトピックを要約」に含まれるために必要な投稿の最低スコア"
+    summary_posts_required: "'このトピックを要約' を有効にするために最低限必要なトピック内の投稿数。この設定を変更すると、1 週間以内で遡って適用されます。"
+    summary_likes_required: "'このトピックを要約' を有効にするために最低限必要なトピック内の「いいね！」数。この設定を変更すると、1 週間以内で遡って適用されます。"
     summary_percent_filter: "「このトピックを要約」をクリックしたとき表示される上位投稿の割合%"
+    summary_max_results: "'このトピックを要約' が返す最大投稿数"
+    enable_personal_messages: "信頼レベル 1 ユーザーによるメッセージとメッセージへの返信の作成を許可する (メッセージを送信する最低信頼レベルで構成可能)。スタッフは設定に関係なく必ずメッセージを作成できます。"
+    enable_system_message_replies: "個人メッセージが無効である場合でも、ユーザーによるシステムメッセージへの返信を許可する"
     enable_long_polling: "通知用のメッセージバスによるロングポーリングの利用を許可する"
+    enable_chunked_encoding: "サーバーによるチャンク形式エンコーディング応答を有効にする。この機能はほとんどのセットアップで動作しますが、一部のプロキシではバッファリングが生じ、応答が遅延する可能性があります。"
     long_polling_base_url: "ロングポーリングのベース URL (CDN が動的コンテンツを配信している場合、これを origin pull に指定してください) 例: http://origin.site.com"
     long_polling_interval: "送信するデータが存在しない場合に、サーバーがクライアントに応答するまで待機する時間 (ログインユーザーのみ)"
     polling_interval: "ロングポーリングではないときの、ログイン済みクライアントのポーリング間隔 (ミリ秒)"
     anon_polling_interval: "匿名クライアントのポーリング間隔 (ミリ秒)"
     background_polling_interval: "ウィンドウがバックグラウンド時のクライアントのポーリング間隔（ミリ秒)"
+    hide_post_sensitivity: "通報された投稿が非表示になる確率"
+    silence_new_user_sensitivity: "新規ユーザーが迷惑通報に基づいて投稿禁止にされる確率"
+    auto_close_topic_sensitivity: "通報されたトピックが自動的にクローズされる確率"
     cooldown_minutes_after_hiding_posts: "通報により非表示状態になった投稿をユーザーが編集可能になるまでの時間 (分)"
+    max_topics_in_first_day: "ユーザーが最初の投稿をしてから 24 時間以内に作成できるトピックの最大数"
+    max_replies_in_first_day: "ユーザーが最初の投稿をしてから 24 時間以内に作成できる返信の最大数"
     tl2_additional_likes_per_day_multiplier: "この数字を掛けると TL2 (メンバー) の 1 日あたりの「いいね！」の上限を増やします"
     tl3_additional_likes_per_day_multiplier: "この数字を掛けると TL3 (レギュラー) の 1 日あたりの「いいね！」の上限を増やします"
     tl4_additional_likes_per_day_multiplier: "この数字を掛けると TL4 (リーダー) の 1 日あたりの「いいね！」の上限を増やします"
@@ -1287,9 +1450,40 @@ ja:
     traditional_markdown_linebreaks: "Markdown の従来形式のラインブレーク (行の終わりにダブルスペース) を使う"
     enable_markdown_typographer: "タイポグラフィルールを使用してテキストの可読性を改善します。まっすぐな引用符 ' を曲がっている引用符 ’ に、(c) (tm) を記号に、-- をエムダッシュなどに置き換えます。"
     enable_markdown_linkify: "リンクのように見えるテキストを自動的にリンクとして扱います。www.example.com と https://example.com は自動的にリンクされます。"
+    markdown_linkify_tlds: "リンクとして自動的に処理されるトップレベルドメインのリスト"
+    markdown_typographer_quotation_marks: "二重引用符と一重引用符の置換ペアのリスト"
     post_undo_action_window_mins: "投稿に対する最近の操作 (「いいね!」、通報等) の取り消しを許可する時間 (分)"
     must_approve_users: "すべての新規ユーザーアカウントがアクセスを許可される前に、スタッフがアカウントを承認する必要がある"
+    invite_code: "ユーザーはこのコードを入力してアカウント登録の許可を得る必要があります。空の場合は無視されます (大文字と小文字は区別されません)"
+    approve_suspect_users: "不審なユーザーをレビューキューに追加します。不審なユーザーは略歴/ウェブサイトにアクセスしましたが閲覧アクティビティはありません。"
+    review_every_post: "すべての投稿をレビューする必要があります。警告！アクセスの多いサイトには推奨されません。"
+    pending_users_reminder_delay_minutes: "モデレーターに新しいユーザーがこの時間以上承認待ちであることを通知します。-1 に設定すると、通知は無効になります。"
+    persistent_sessions: "ユーザーはブラウザが閉じられてもログインのままになる"
+    maximum_session_age: "ユーザーは最後の訪問から n 時間以内はログインしたままになる"
+    ga_version: "使用する Google Universal Analytics のバージョン: v3 (analytics.js)、v4 (gtag)"
+    ga_universal_tracking_code: "Google Universal Analytics トラッキングコード ID。例: UA-12345678-9。<a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a> をご覧ください"
+    ga_universal_domain_name: "Google Universal Analytics ドメイン名。例: mysite.com。<a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a> をご覧ください"
+    ga_universal_auto_link_domains: "Google Universal Analytics クロスドメイントラッキングを有効にする。これらのドメインへの発信リンクにはクライアント ID が追加されます。<a href='https://support.google.com/analytics/answer/1034342?hl=en' target='_blank'>Google のクロスドメイントラッキングガイド</a>をご覧ください。"
+    gtm_container_id: "Google Tag Manager コンテナ ID。例: GTM-ABCDEF。<br/>注意: GTM が読み込むサードパーティスクリプトは、'content security policy script src' のホワイトリストに追加されている必要がある場合があります。"
+    enable_escaped_fragments: "ウェブクローラーが検出されない場合、Google の Ajax-Crawling API にフォールバックする。<a href='https://developers.google.com/webmasters/ajax-crawling/docs/learn-more' target='_blank'>https://developers.google.com/webmasters/ajax-crawling/docs/learn-more</a> をご覧ください。"
+    moderators_manage_categories_and_groups: "モデレーターによるカテゴリとグループの管理を許可する"
+    moderators_change_post_ownership: "モデレーターによる投稿の所有権の変更を許可する"
     cors_origins: "CORS を許可。オリジンは http:// か https:// を含む必要があります。CORS を有効にするには、環境変数　DISCOURSE_ENABLE_CORS に true を設定する必要があります。"
+    use_admin_ip_allowlist: "管理者はスクリーン対象 IP リスト (管理者 > ログ > スクリーン対象 IP) に定義されている IP アドレスからのみログインできる。"
+    blocked_ip_blocks: "Discourse によって決してクロールされない非公開 IP ブロックリスト"
+    allowed_internal_hosts: "Discourse がワンボックスやその他の目的で安全にクロールできる内部ホストのリスト"
+    allowed_onebox_iframes: "ワンボックス埋め込みを介して許可される iframe src ドメインのリスト。`*` はすべてのデフォルトのワンボックスエンジンを許可します。"
+    allowed_iframes: "Discourse が投稿で安全に許可できる iframe src ドメインプレフィックスのリスト"
+    allowed_crawler_user_agents: "サイトへのアクセスを許可する必要のあるウェブクローラーのユーザーエージェント。警告！これを設定すると、ここにリストされていないすべてのクローラーが拒否されます！"
+    blocked_crawler_user_agents: "サイトへのアクセスを許可してはいけないウェブクローラーを識別する、ユーザーエージェント文字列の大文字と小文字を区別しない一意の語。ホワイトリストが定義されている場合は適用されません。"
+    slow_down_crawler_user_agents: "Crawl-delay ディレクティブを使用して robots.txt でレート制限する必要があるウェブクローラーのユーザーエージェント"
+    slow_down_crawler_rate: "このレートに slow_down_crawler_user_agents が指定されている場合、このレートはすべてのクローラーに適用されます (リクエスト間の遅延秒数)"
+    content_security_policy: "Content-Security-Policy を有効にする"
+    content_security_policy_report_only: "Content-Security-Policy-Report-Only を有効にする"
+    content_security_policy_collect_reports: "/csp_reports で CSP 違反レポートの収集を有効にする"
+    content_security_policy_frame_ancestors: "CSP を介してこのサイトを iframe に埋め込むことのできるユーザーを制限する。許可されるホストを <a href='%{base_path}/admin/customize/embedding'>埋め込み</a>で制御します。"
+    content_security_policy_script_src: "追加のホワイトリストにあるスクリプトソース。現在のホストと CDN はデフォルトで含まれています。<a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>コンテンツセキュリティポリティーで XSS 攻撃を緩和する</a> をご覧ください。"
+    invalidate_inactive_admin_email_after_days: "この日数以上サイトを訪問していない管理者アカウントは、ログインする前にメールアドレスを再確認する必要があります。0 に設定すると無効になります。"
     top_menu: "ホームナビゲーションに表示する項目・表示順を指定。例: latest|new|unread|categories|top|read|posted|bookmarks"
     post_menu: "投稿メニューに表示する項目を指定。例 like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "展開ボタンがクリックされるまで、デフォルトで非表示にする投稿のメニュー項目。"
@@ -1298,31 +1492,108 @@ ja:
     site_contact_group_name: "すべての自動メッセージに招待される有効なグループ名。"
     send_welcome_message: "すべての新規ユーザーにクイックスタートガイド付きのウェルカムメッセージを送信する。"
     send_tl1_welcome_message: "新しい信頼レベル 1 のユーザーにウェルカムメッセージを送信します。"
+    send_tl2_promotion_message: "新しい信頼レベル 2 ユーザーに昇格に関するメッセージを送信します。"
     suppress_reply_directly_below: "投稿に返信が 1 つしかない場合、投稿の展開可能な返信数を表示しない。"
     suppress_reply_directly_above: "投稿に返信が 1 つしかない場合、投稿の展開可能な in-reply-to を表示しない。"
+    remove_full_quote: "ダイレクト返信の完全な引用を自動的に削除します。"
     suppress_reply_when_quoting: "投稿が引用返信だった場合、投稿の展開可能な in-reply-to を表示しない。"
     max_reply_history: "in-reply-toを展開するときに展開する返信の最大数"
     topics_per_period_in_top_summary: "デフォルトの人気トピックの要約に表示される人気トピックの数"
     topics_per_period_in_top_page: "人気トピックの 'もっと表示' を展開したときに、人気トピックに表示する人気トピックの数"
     redirect_users_to_top_page: "新規ユーザーと長く不在のユーザーをトップページに自動的にリダイレクトする"
+    top_page_default_timeframe: "トップビューページのデフォルトの時間枠。"
+    moderators_view_emails: "モデレーターによるユーザーメールの閲覧を許可する"
+    prioritize_username_in_ux: "ユーザーページ、ユーザーカード、および投稿の最初にユーザー名を表示する (無効にすると先に名前が表示されます)"
+    enable_rich_text_paste: "テキストをコンポーザーに貼り付ける際に、HTML からマークダウンへの自動変換を有効にする (実験的)。"
+    send_old_credential_reminder_days: "日数後に古い資格情報についてリマインダーする"
     email_token_valid_hours: "「パスワードを忘れました」またはアカウントアクティベーションのトークンを有効にする時間 (n)"
     enable_badges: "バッジ機能を有効にする"
+    max_favorite_badges: "ユーザーが選択できるバッジの最大数"
+    enable_whispers: "トピック内でのスタッフの非公開コミュニケーションを許可する。"
+    allow_index_in_robots_txt: "このサイトがウェブ検索エンジンによるインデックス作成を許可していることを robots.txt に指定します。例外的なケースでは、永続的に <a href='%{base_path}/admin/customize/robots'>robots.txt をオーバーライド</a>できます。"
     blocked_email_domains: "ユーザーがアカウント登録をすることができないメールドメインの、パイプ区切りのリスト。例: mailinator.com|trashmail.net"
     allowed_email_domains: "ユーザー登録に必要なメールドメインのパイプ区切りのリスト。警告: 指定したメールドメイン以外のユーザーの登録は許可されません！"
+    auto_approve_email_domains: "このドメインリストのメールアドレスを持つユーザーは自動的に承認されます。"
+    hide_email_address_taken: "登録中およびパスワード忘れのフォームを使用中に、指定されたメールアドレスのアカウントが既に存在することをユーザーに通知しない。"
     log_out_strict: "ログアウトした際に、そのユーザーの全デバイスのセッションをログアウトする"
+    version_checks: "Discourse に Ping してバージョン更新を確認し、<a href='%{base_path}/admin' target='_blank'>/admin</a> ダッシュボードに新しいバージョンに関するメッセージを表示する"
     new_version_emails: "Discourse の新しいバージョンが利用可能になった際に contact_email アドレスにメールで通知する"
     invite_expiry_days: "ユーザー招待キーの有効期間 (日)"
+    invite_only: "すべての新規ユーザーは、信頼できるユーザーまたはスタッフによって明示的に招待される必要がある。公開登録は無効です。"
     login_required: "サイトのコンテンツを閲覧するには認証を必須にして、匿名アクセスを拒否する"
+    min_username_length: "ユーザー名の最低文字数。警告: 既存のユーザーまたはグループがこれより短い名前を使用している場合は、サイトが機能しなくなります！"
+    max_username_length: "ユーザー名の最大文字数。警告: 既存のユーザーまたはグループがこれより長い名前を使用している場合は、サイトが機能しなくなります！"
+    unicode_usernames: "ユーザー名とグループ名に Unicode 文字と数字を使用することを許可する。"
+    allowed_unicode_username_characters: "ユーザー名に一部の Unicode 文字のみを許可する正規表現。ASCII 文字と数字は常に許可されているため、ホワイトリストに含める必要はありません。"
+    reserved_usernames: "登録が許可されていないユーザー名。ワイルドカード記号 * は任意の文字に 0 回以上一致させるために使用できます。"
     min_password_length: "パスワードの最小の長さ"
+    min_admin_password_length: "管理者パスワードの最低文字数"
+    password_unique_characters: "パスワードに必要な一意の文字の最低数。"
     block_common_passwords: "最もよく使われている 10,000 個のパスワードを許可しない"
+    auth_skip_create_confirm: 外部認証を介して登録する場合、アカウントの作成ポップアップを省略する。auth_overrides_email、auth_overrides_username、および auth_overrides_name と共に使用するのが最適です。
+    auth_immediately: "ユーザーの操作なしで外部ログインシステムに自動的にリダイレクトする。これは、login_required が true であり、外部認証方法が 1 つしかない場合にのみ有効です。"
+    enable_discourse_connect: "DiscourseConnect (旧 'Discourse SSO') を介したサインオンを有効にする (警告: ユーザーのメールアドレスは外部サイトで *検証される必要があります*！)"
+    verbose_discourse_connect_logging: "詳細な DiscourseConnect 関連診断を <a href='%{base_path}/logs' target='_blank'>/logs</a> に記録する"
+    enable_discourse_connect_provider: "DiscourseConnect (旧 'Discourse SSO') プロバイダープロトコルを /session/sso_provider エンドポイントに実装する。discourse_connect_provider_secrets を設定する必要があります"
+    discourse_connect_url: "DiscourseConnect エンドポイントの URL (http:// または https:// を含める必要があります)"
+    discourse_connect_secret: "DiscourseConnect 認証情報の暗号化に利用する秘密の文字列。10文字以上である必要があります"
+    discourse_connect_provider_secrets: "DiscourseConnect を使用しているドメインとシークレットのペアのリスト。DiscourseConnect シークレットは 10 文字以上であることを確認してください。ワイルドカード記号 * を使用して、任意のドメインまたはその一部のみに一致させることができます (例: *.example.com)。"
+    discourse_connect_overrides_bio: "ユーザープロフィールのユーザー略歴をオーバーライドし、ユーザーが変更できないようにする"
+    discourse_connect_overrides_groups: "すべての手動グループメンバーシップをグループ属性に指定されたグループと同期する (警告: グループを指定しない場合、ユーザーのすべての手動グループメンバーシップがクリアされます)"
+    auth_overrides_email: "ログインするたびにローカルメールを外部サイトメールでオーバーライドし、ローカルでの変更を防止する。すべての認証プロバイダーに適用されます (警告: ローカルメールの正規化により、矛盾が生じる可能性があります)"
+    auth_overrides_username: "ログインするたびにローカルユーザー名を外部サイトのユーザー名でオーバーライドし、ローカルでの変更を防止する。すべての認証プロバイダーに適用されます (警告: ユーザー名の長さ/要件の違いにより、矛盾が発生する可能性があります)。"
+    auth_overrides_name: "ログインするたびにローカルのフルネームを外部サイトのフルネームでオーバーライドする。すべての認証プロバイダーに適用されます。"
+    discourse_connect_overrides_avatar: "ユーザーのアバターを DiscourseConnect ペイロードの値でオーバーライドする。有効である場合、ユーザーは Discourse にアバターをアップロードできなくなります。"
+    discourse_connect_overrides_location: "ユーザーの場所を DiscourseConnect ペイロードの値でオーバーライドし、ローカルの変更を防止する。"
+    discourse_connect_overrides_website: "ユーザーのウェブサイトを DiscourseConnect ペイロードの値でオーバーライドし、ローカルの変更を防止する。"
+    discourse_connect_overrides_profile_background: "ユーザープロフィールの背景を DiscourseConnect ペイロードの値でオーバーライドする。"
+    discourse_connect_overrides_card_background: "ユーザーカードの背景を DiscourseConnect ペイロードの値でオーバーライドする。"
+    discourse_connect_not_approved_url: "未承認の DiscourseConnect アカウントをこの URL にリダイレクトする"
+    discourse_connect_allows_all_return_paths: "DiscourseConnect が指定する return_paths のドメインを制限しない (デフォルトでは、リターンパスは現在のサイトにある必要があります)"
+    enable_local_logins: "ローカルのユーザー名とパスワードでログインするアカウントを有効にする。警告: 無効にすると、以前に少なくとも 1 つの代替ログイン方法を構成していない場合にログインできなくなる可能性があります。"
+    enable_local_logins_via_email: "メールで送信されるワンクリックログインリンクをユーザーがリクエストすることを許可する。"
     allow_new_registrations: "新しいユーザーの登録を許可。新規アカウントを作成できないようにするには、これをオフにします。"
+    enable_signup_cta: "匿名のリピートユーザーにアカウント登録を促す通知を表示する。"
+    enable_google_oauth2_logins: "Google OAuth2 認証を有効にする。これは、Google が現在サポートしている認証方法です。キーとシークレットが必要です。「<a href='https://meta.discourse.org/t/15858' target='_blank'>Discourse 用に Google ログインを構成する</a>」をご覧ください。"
     google_oauth2_client_id: "あなたの Google アプリケーションのクライアント ID"
     google_oauth2_client_secret: "あなたの Google アプリケーションのクライアントシークレット"
+    google_oauth2_prompt: "認証サーバーがユーザーに再認証と同意を促すかどうかを指定する文字列のスペース区切りリスト (オプション)。使用できる値については、<a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a> をご覧ください。"
+    google_oauth2_hd: "サインインが制限される Google Apps Hosted ドメイン (オプション)。詳細については、<a href='https://developers.google.com/identity/protocols/OpenIDConnect#hd-param' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#hd-param</a> をご覧ください。"
+    enable_twitter_logins: "Twitter 認証を有効にする。twitter_consumer_key と twitter_consumer_secret が必要です。「<a href='https://meta.discourse.org/t/13395' target='_blank'>Discourse で Twitter ログイン (およびリッチの埋め込み) を構成する</a>」をご覧ください。"
+    twitter_consumer_key: "<a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a> で登録されている Twitter 認証のコンシューマーキー。"
+    twitter_consumer_secret: "<a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a> で登録されている Twitter 認証のコンシューマーシークレット。"
+    enable_facebook_logins: "Facebook 認証を有効にする。facebook_app_id と facebook_app_secretが必要です。「<a href='https://meta.discourse.org/t/13394' target='_blank'>Discourse で Facebook ログインを構成する</a>」をご覧ください。"
+    facebook_app_id: "<a href='https://developers.facebook.com/apps/' target='_blank'>https://developers.facebook.com/apps</a> で登録されている Facebook 認証と共有のアプリ ID。"
+    facebook_app_secret: "<a href='https://developers.facebook.com/apps/' target='_blank'>https://developers.facebook.com/apps</a> で登録されている Facebook 認証のアプリシークレット。"
+    enable_github_logins: "GitHub 認証を有効にする。github_client_id と github_client_secret が必要です。「<a href='https://meta.discourse.org/t/13745' target='_blank'>Discourse で GitHub ログインを構成する</a>」をご覧ください。"
+    github_client_id: "<a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a> で登録されている GitHub 認証のクライアント ID。"
+    github_client_secret: "<a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a> で登録されている GitHub 認証のクライアント シークレット。"
+    enable_discord_logins: "Discord を使ったユーザーの認証を許可しますか？"
+    discord_client_id: 'Discord クライアント ID (必要ですか？<a href="https://discordapp.com/developers/applications/me">Discord 開発者ポータル</a>にアクセスしてください)'
+    discord_secret: "Discord シークレットキー"
+    discord_trusted_guilds: 'これらの Discord ギルドのメンバーのみに Discord を介してログインすることを許可する。ギルドの番号 ID を使用してください。詳細については、<a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">こちら</a>の手順をご覧ください。すべてのギルドを許可する場合は、空のままにします。'
+    enable_backups: "管理者によるフォーラムのバックアップ作成を許可する"
+    allow_restore: "復元を許可。サイトの全データが置き換えられます！バックアップを復元する予定がない場合は無効のままにしてください"
     maximum_backups: "ディスクに保存するバックアップの最大数。古いバックアップは自動的に削除されます"
+    automatic_backups_enabled: "バックアップ頻度の定義に従って自動バックアップを実行する"
+    backup_frequency: "バックアップ間の日数。"
     s3_backup_bucket: "バックアップを保持するリモートバケット。警告: 必ずプライベートバケットになっていることを確認してください"
+    s3_endpoint: "エンドポイントは DigitalOcean Spaces または Minio などの S3 対応サービスにバックアップするように変更できます。警告: AWS S3 を使用している場合は空のままにしてください。"
+    s3_configure_tombstone_policy: "トゥームストーンアップロードの自動削除ポリシーを有効にする。重要: 無効である場合、アップロードが削除された後にスペースを再確保することはありません。"
+    s3_disable_cleanup: "最大許容数を超えるバックアップが存在する場合、S3 の古いバックアップの削除を防止する。"
+    enable_s3_inventory: "Amazon S3 インベントリを使ってレポートを生成してアップロードを確認する。重要: 有効な S3 資格情報が必要です (access key id と secret access key)。"
+    backup_time_of_day: "バックアップが発生する必要のある時刻 (UTC)。"
+    backup_with_uploads: "スケジュールされたバックアップにアップロードを含める。これを無効にすると、データベースのみがバックアップされます。"
+    backup_location: "バックアップが保存される場所。重要: S3 には、ファイルの設定に入力されている有効な S3 資格情報が必要です。"
+    backup_gzip_compression_level_for_uploads: "アップロードの圧縮に使用される Gzip 圧縮レベル。"
+    include_thumbnails_in_backups: "生成されたサムネイルをバックアップに含める。これを無効にするとバックアップが小さくなりますが、復元後にすべての投稿を rebake する必要があります。"
     active_user_rate_limit_secs: "'last_seen_at' フィールドを更新する頻度 (秒)"
     verbose_localization: "UI に詳細なローカリゼーションのヒントを表示する"
     previous_visit_timeout_hours: "'previous' visit とみなす時間 (時間)"
+    top_topics_formula_log_views_multiplier: "人気のトピックの計算式に使用するログビューの乗数 (n) の値: `log(views_count) * (n) + op_likes_count * 0.5 + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
+    top_topics_formula_first_post_likes_multiplier: "人気のトピックの計算式に使用する最初の投稿の「いいね！」の乗数 (n) の値: `log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
+    top_topics_formula_least_likes_per_post_multiplier: "人気のトピックの計算式に使用する最小「いいね！」率の乗数 (n) の値: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
+    enable_safe_mode: "プラグインをデバッグするためにユーザーによる安全モードの開始を許可する。"
     rate_limit_create_topic: "トピック作成後、ユーザーは (n) 秒待ってから次のトピックを作成する必要があります。"
     rate_limit_create_post: "投稿後、ユーザーは (n) 秒待ってから次の投稿を作成する必要があります。"
     rate_limit_new_user_create_topic: "トピック作成後、新規ユーザーは (n) 秒待ってから次のトピックを作成する必要があります。"
@@ -1332,19 +1603,54 @@ ja:
     max_bookmarks_per_day: "ユーザーが 1 日にブックマークできる最大数"
     max_edits_per_day: "ユーザーが 1 日に編集できる最大数"
     max_topics_per_day: "ユーザーが 1 日に作成できるトピックの最大数"
+    max_personal_messages_per_day: "ユーザーが 1 日に作成できる新しい個人メッセージのトピックの最大数"
     max_invites_per_day: "ユーザーが 1 日に招待できる最大数"
     max_topic_invitations_per_day: "ユーザーが 1 日にトピックに招待できる最大数"
+    max_logins_per_ip_per_hour: "1 時間あたりに IP アドレスごとに許可する最大ログイン数"
+    max_logins_per_ip_per_minute: "1 分あたりに IP アドレスごとに許可する最大ログイン数"
+    max_post_deletions_per_minute: "1 分あたりにユーザーが削除できる最大投稿数。0 に設定すると、投稿の削除を無効にします。"
+    max_post_deletions_per_day: "1 日あたりにユーザーが削除できる最大投稿数。0 に設定すると、投稿の削除を無効にします。"
+    invite_link_max_redemptions_limit: "招待リンクに許可される最大引き換え数はこの値を超えることはできません。"
+    invite_link_max_redemptions_limit_users: "通常のユーザーが生成した招待リンクに許可される最大引き換え数はこの値を超えることはできません。"
+    alert_admins_if_errors_per_minute: "管理者アラートをトリガーするための 1 分あたりのエラー数。値 0 はこの機能を無効にします。注意: 再起動が必要です。"
+    alert_admins_if_errors_per_hour: "管理者アラートをトリガーするための 1 時間あたりのエラー数。値 0 はこの機能を無効にします。注意: 再起動が必要です。"
+    categories_topics: "/categories ページに表示するトピック数。0 に設定すると、2 つの列 (カテゴリとトピック) を対称に維持するための値が自動的に求められます。"
     suggested_topics: "トピックの下に表示される推奨トピックの数"
     limit_suggested_to_category: "推奨トピックには現在参照しているカテゴリのトピックのみを表示する。"
     suggested_topics_max_days_old: "投稿されて n 日経過したものを推奨トピックにしない。"
+    suggested_topics_unread_max_days_old: "投稿されて n 日経過したものを未読の推奨トピックにできません。"
     clean_up_uploads: "不正なホスティングを防ぐために、どこからも参照されていないアップロードを削除する。警告: この設定を有効にする前に /uploads ディレクトリをバックアップすることをお勧めします。"
     clean_orphan_uploads_grace_period_hours: "どこからもリンクされていないアップロードを削除するまでの猶予期間 (時間)。"
     purge_deleted_uploads_grace_period_days: "削除されたアップロードが消去されるまでの猶予期間 (日)。"
+    purge_unactivated_users_grace_period_days: "アカウントをアクティベーションしなかったユーザーが削除されるまでの猶予期間 (日数)。0 に設定すると、アクティベートしていないユーザーは絶対に消去されません。"
     enable_s3_uploads: "Amazon S3 ストレージにアップロードを配置する。重要: 有効な S3 資格情報 (アクセスキー ID とシークレットアクセスキーの両方) が必要です。"
+    s3_use_iam_profile: '<a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html">AWS EC2 インスタンスプロファイル</a>を使用して、S3 バケットへのアクセスを許可する。注意: これを有効にするには、Discourse が適切に構成された EC2 インスタンスで実行している必要があり、有効することによって "s3 access key id" と "s3 secret access key" の設定が上書きされます。'
     s3_upload_bucket: "ファイルをアップロードする Amazon S3 のバケット名。警告: 小文字である必要があり、ピリオドとアンダースコアは使用できません。"
+    s3_access_key_id: "画像、添付ファイル、およびバックアップのアップロードに使用される Amazon S3 の access key id。"
+    s3_secret_access_key: "画像、添付ファイル、およびバックアップのアップロードに使用される Amazon S3 の secret access key。"
+    s3_region: "画像とバックアップのアップロードに使用される Amazon S3 のリージョン名。"
     s3_cdn_url: "すべての s3 アセットに使用する CDN の URL (例: https://cdn.somewhere.com)。警告: この設定を変更した後は過去の全投稿を rebake する必要があります。"
     avatar_sizes: "自動生成されたアバターのサイズのリスト"
     external_system_avatars_enabled: "外部のアバターシステムサービスを使用します。"
+    external_system_avatars_url: "外部システムアバターサービスの URL。許可されている置換は、{username} {first_letter} {color} {size} です。"
+    external_emoji_url: "絵文字画像の外部サービスの URL。無効にするには空のままにします。"
+    use_site_small_logo_as_system_avatar: "システムユーザーのアバターの代わりにサイトの small logo を使用する。ロゴが存在する必要があります。"
+    restrict_letter_avatar_colors: "文字アバターの背景に使用される 6 桁の 16 進数の色値のリスト。"
+    selectable_avatars_enabled: "ユーザーにリストからアバターを選択するように強制する。"
+    selectable_avatars: "ユーザーが選択できるアバターのリスト。"
+    allow_all_attachments_for_group_messages: "グループメッセージのメールの添付ファイルをすべて許可する。"
+    png_to_jpg_quality: "変換された JPG ファイルの品質 (1 は最低品質、99 は最高品質、100 は無効)。"
+    recompress_original_jpg_quality: "アップロードされた画像ファイルの品質 (1 は最低品質、99 は最高品質、100 は無効)。"
+    image_preview_jpg_quality: "サイズ変更された画像ファイルの品質 (1 は最低品質、99 は最高品質、100 は無効)。"
+    allow_staff_to_upload_any_file_in_pm: "スタッフメンバーによる PM でのファイルのアップロードを許可する。"
+    strip_image_metadata: "画像メタデータを削除する。"
+    composer_media_optimization_image_enabled: "アップロードされた画像ファイルのクライアント側のメディア最適化を有効にします。"
+    composer_media_optimization_image_bytes_optimization_threshold: "クライアント側の最適化をトリガーする画像ファイルの最小サイズ"
+    composer_media_optimization_image_resize_dimensions_threshold: "クライアント側のサイズ変更をトリガーする画像の最小幅"
+    composer_media_optimization_image_resize_width_target: "幅が `composer_media_optimization_image_dimensions_resize_threshold` より大きい画像はこの花にサイズ変更されます。`composer_media_optimization_image_dimensions_resize_threshold` 以上 (>=) である必要があります。"
+    composer_media_optimization_image_encode_quality: "再エンコードプロセスで使用される JPEG エンコード品質。"
+    min_ratio_to_crop: "高さのある画像のトリミングに使用される比率。幅 ÷ 高さの結果を入力します。"
+    simultaneous_uploads: "コンポーザーにドラッグアンドドロップできるファイルの最大数"
     default_invitee_trust_level: "招待したユーザーのデフォルトの信頼レベル (0～4)。"
     default_trust_level: "新規ユーザーのデフォルトの信頼レベル (0～4) です。警告: 変更すると深刻な迷惑行為のリスクがあります。"
     tl1_requires_topics_entered: "新規ユーザーが信頼レベル 1 に昇格するために閲覧しなければならないトピックの数。"
@@ -1358,33 +1664,71 @@ ja:
     tl2_requires_likes_given: "ユーザーが信頼レベル 2 に昇格するために付けなければならない「いいね！」の数。"
     tl2_requires_topic_reply_count: "ユーザーが信頼レベル 2 に昇格するために返信しなければいけないトピックの数。"
     tl3_time_period: "信頼レベル 3 に必要な期間 (日数)"
+    tl3_requires_days_visited: "信頼レベル 3 への昇格資格を満たす上で、ユーザーが過去 (tl3 time period) 日間でサイトにアクセスする必要がある最低日数。tl3 time period よりも高い値を設定すると、tl3 への昇格が無効になります。(0 以上)"
+    tl3_requires_topics_replied_to: "信頼レベル 3 への昇格資格を満たす上で、ユーザーが過去 (tl3 time period) 日間で返信する必要のある最低トピック数。(0 以上)"
+    tl3_requires_topics_viewed: "信頼レベル 3 への昇格資格を満たす上で、ユーザーが閲覧する必要のある過去 (tl3 time period) 日間に作成されたトピックのパーセント率。(0～100)"
+    tl3_requires_topics_viewed_cap: "過去 (tl3 time period) 日間で閲覧されたトピックの最大必要件数。"
+    tl3_requires_posts_read: "信頼レベル 3 への昇格資格を満たす上で、ユーザーが閲覧する必要のある過去 (tl3 time period) 日間に作成された投稿のパーセント率。(0～100)"
+    tl3_requires_posts_read_cap: "過去 (tl3 time period) 日間で閲覧された投稿の最大必要件数。"
     tl3_requires_topics_viewed_all_time: "ユーザーが信頼レベル 3 に昇格するために閲覧しなければならないトピックの合計数。"
     tl3_requires_posts_read_all_time: "ユーザーが信頼レベル 3 に昇格するために読まなければならない投稿の合計数。"
+    tl3_requires_max_flagged: "信頼レベル 3 への昇格資格を満たすには、過去 (tl3 time period) 日間で x 件を超える投稿が x 人のユーザーから通報されていない必要があります。x はこの設定の値です。(0 以上)"
     tl3_promotion_min_duration: "信頼レベル 3 に昇格したユーザーが、信頼レベル 2 に降格しない日数。"
+    tl3_requires_likes_given: "信頼レベル 3 への昇格資格を満たす上で、ユーザーが過去 (tl3 time period) 日間で与える必要のある「いいね！」の最小数。"
+    tl3_requires_likes_received: "信頼レベル 3 への昇格資格を満たす上で、ユーザーが過去 (tl3 time period) 日間で得る必要のある「いいね！」の最小数。"
     tl3_links_no_follow: "信頼レベル 3 のユーザーが投稿したリンクから rel=nofolow を削除しない。"
+    trusted_users_can_edit_others: "信頼レベルの高いユーザーがほかのユーザーのコンテンツを編集することを許可する"
     min_trust_to_create_topic: "新規トピックを作成するために必要な最低信頼レベル。"
+    allow_flagging_staff: "有効にすると、ユーザーはスタッフアカウントの投稿を通報できるようになります。"
     min_trust_to_edit_wiki_post: "ウィキとしてマークされた投稿を編集するために必要な最低信頼レベル。"
+    min_trust_to_edit_post: "投稿を編集するために必要な最低信頼レベル。"
+    min_trust_to_allow_self_wiki: "ユーザー自身の投稿をウィキにするために必要な最低信頼レベル。"
+    min_trust_to_send_messages: "新しい個人メッセージを作成するために必要な最低信頼レベル。"
+    min_trust_to_send_email_messages: "メールで個人メッセージを送信するために必要な最低信頼レベル。"
+    min_trust_to_flag_posts: "投稿を通報するために必要な最低信頼レベル"
+    min_trust_to_post_links: "投稿にリンクを含めるために必要な最低信頼レベル"
+    min_trust_to_post_embedded_media: "投稿にメディア項目を埋め込むために必要な最低信頼レベル"
+    min_trust_level_to_allow_profile_background: "プロフィールの背景をアップロードするために必要な最低信頼レベル"
+    min_trust_level_to_allow_user_card_background: "ユーザーカードの背景をアップロードするために必要な最低信頼レベル"
+    min_trust_level_to_allow_invite: "ユーザーを招待するために必要な最低信頼レベル"
+    min_trust_level_to_allow_ignore: "ユーザーを無視するために必要な最低信頼レベル"
+    allowed_link_domains: "リンクを投稿するための適切な信頼レベルに達していなくてもリンクできるドメイン"
     newuser_max_links: "新規ユーザーが投稿に追加できるリンクの数"
+    newuser_max_embedded_media: "新規ユーザーが投稿に追加できる埋め込みメディア項目の数。"
     newuser_max_attachments: "新規ユーザーが投稿に追加できる添付ファイルの数"
     newuser_max_mentions_per_post: "新規ユーザーが投稿で @name 通知を行える最大回数"
     newuser_max_replies_per_topic: "他のユーザーが返信するまで、新規ユーザーが 1 つのトピックで行える返信の最大数。"
     max_mentions_per_post: "すべてのユーザーが投稿内で @name 通知を行える最大数"
+    max_users_notified_per_group_mention: "グループがメンションされたときに通知を受信するユーザーの最大数 (しきい値に達した場合、通知は発生しません)"
+    enable_mentions: "ユーザーによるほかのユーザーのメンションを許可する。"
     create_thumbnails: "大きすぎて投稿に収まらないが画像のサムネイルを作成し、ライトボックにします。"
     email_time_window_mins: "ユーザーに最終編集の機会を与えられるよう、通知メールを送信するまで (n) 分待機する。"
+    personal_email_time_window_seconds: "ユーザーがメッセージの最終編集を行えるよう、 (n) 秒待ってから個人メッセージの通知メールを送信する。"
     email_posts_context: "通知メールにコンテキストとして含める以前の返信の件数。"
     flush_timings_secs: "サーバーに消去タイミングデータを送信する頻度 (秒)。"
     title_max_word_length: "トピックタイトルの最大文字数"
     title_min_entropy: "トピックタイトルの最小許容エントロピー (特殊文字や英語以外の単語を含むとより大きな値になります)"
     body_min_entropy: "投稿本文の最小許容エントロピー (特殊文字や英語以外の単語を含むとより大きな値になります)"
     allow_uppercase_posts: "トピックタイトルまたは投稿本文での大文字のみ使用を許可する。"
+    max_consecutive_replies: "返信を追加できなくなるまでに、ユーザーがトピックで連続して作成できる投稿数。"
+    enable_filtered_replies_view: '"返信 (n) 件" ボタンはほかのすべての投稿を折りたたみ、現在の投稿とその返信のみを表示します。'
+    title_fancy_entities: "トピックのタイトル内の共通の ASCII 文字をファンシーな HTML エンティティ (SmartyPants、<a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>) に変換する"
     min_title_similar_length: "類似トピックのチェックに必要な最小タイトル長"
+    desktop_category_page_style: "/categories ページの視覚的スタイル。"
     category_colors: "カテゴリに利用可能な 16 進数の色値のリスト"
     category_style: "カテゴリバッジの視覚的スタイル"
+    default_dark_mode_color_scheme_id: "ダークモードで使用される色スキーム。"
     dark_mode_none: "なし"
+    max_image_size_kb: "最大画像アップロードサイズ (kB)。これは、nginx (client_max_body_size) / apache またはプロキシでも構成されている必要があります。これより大きいか、client_max_body_size より小さい画像は、アップロード時にフィットするようにサイズ変更されます。"
     max_attachment_size_kb: "添付可能なファイルの最大サイズ (kB)。nginx (client_max_body_size) / apache または proxy でも設定する必要があります。"
     authorized_extensions: "アップロードできるファイルの拡張子のリスト (すべての拡張子を有効にするには '*' を使用してください)"
+    authorized_extensions_for_staff: "`authorized_extensions` サイト設定で定義されたリストに加えて、スタッフユーザーがアップロードできるファイル拡張子のリスト。(すべてのファイルタイプを有効にするには '*' を使用します)"
+    theme_authorized_extensions: "テーマのアップロードに使用できるファイルの拡張子のリスト (すべての拡張子を有効にするには '*' を使用します)"
     max_similar_results: "新規トピックを作成中に、エディターの上に表示する類似トピックの数。タイトルと本文に基づいて比較されます。"
+    max_image_megapixels: "画像に許可されるメガピクセルの最大数。これより大きいメガピクセルの画像は拒否されます。"
     title_prettify: "一般的なタイトルのスペルミスやエラー (すべて大文字、先頭の小文字、複数の！や？の使用、文末の重複するピリオドなど) を防止します。"
+    title_remove_extraneous_space: "句読点の前にある先頭の空白を削除する。"
+    automatic_topic_heat_values: 'サイトのアクティビティに基づいて、"topic views heat" と "topic post like heat" 設定を自動的に更新する。'
     topic_views_heat_low: "指定された数の閲覧があると、閲覧フィールドはやや強調表示されます。"
     topic_views_heat_medium: "指定された数の閲覧があると、閲覧フィールドは中程度に強調表示されます。"
     topic_views_heat_high: "指定された数の閲覧があると、閲覧フィールドは濃く強調表示されます。"
@@ -1400,70 +1744,297 @@ ja:
     faq_url: "使用する FAQ が他の場所でホスティングされている場合、その完全な URL をここに指定します。"
     tos_url: "使用する利用規約が他の場所でホスティングされている場合、その完全な URL をここに指定します。"
     privacy_policy_url: "使用するプライバシーポリシーが他の場所でホスティングされている場合、その完全な URL をここに指定します。"
+    log_anonymizer_details: "匿名化された後、ユーザーの詳細をログに維持するかどうか。GDPR に準拠する場合、これをオフにする必要があります。"
+    newuser_spam_host_threshold: "`newuser_spam_host_threshold` 投稿内で新規ユーザーが迷惑とみなされる前に、同じホストにリンクを投稿できる回数。"
     allowed_spam_host_domains: "スパムホスト検査から除外するドメインのリスト。新規ユーザーはこれらのドメインへのリンクを使って投稿を作成することができます。"
+    staff_like_weight: "スタッフの「いいね！」に与えられる重み (スタッフ以外の「いいね！」には 1 の重みがあります。)"
+    topic_view_duration_hours: "N 時間ごとに IP/ユーザーあたりの新規トピックビューを 1 回カウントする"
+    user_profile_view_duration_hours: "N 時間ごとに IP/ユーザーあたりの新規ユーザープロフィールビューを 1 回カウントする"
     levenshtein_distance_spammer_emails: "迷惑メールのアドレスを照合する場合、あいまい一致を許可する文字数の差。"
     max_new_accounts_per_registration_ip: "この IP でアクセスする信頼レベル 0 のアカウントが (n) 個存在する場合 (さらにこれらがスタッフメンバーや TL2 以上のメンバーでない場合)、この IP から新たに登録できないようにします。"
     min_ban_entries_for_roll_up: "ロールアップボタンをクリックする際に少なくとも (N) 個のエントリーがある場合、新しいサブネット禁止エントリーを作成します。"
     max_age_unmatched_emails: "(N) 日間一致しなかったスクリーン対象メールアドレスを削除します。"
     max_age_unmatched_ips: "(N) 日間一致しなかったスクリーン対象 IP アドレスを削除します。"
     num_flaggers_to_close_topic: "トピックを自動的に停止して介入するために必要なユニーク通報ユーザーの最小数"
+    num_hours_to_close_topic: "介入目的でトピックを一時呈する時間数。"
     auto_respond_to_flag_actions: "通報を解除したときの自動返信を有効にします。"
     min_first_post_typing_time: "最初の投稿時にユーザーが入力する必要のある最低時間 (ミリ秒)。しきい値を満たさない場合、投稿は自動的に要承認キューに追加されます。無効にするには 0 を設定します (非推奨)"
+    auto_silence_fast_typers_on_first_post: "min_first_post_typing_time を満たさないユーザーを自動的に投稿禁止にする"
+    auto_silence_fast_typers_max_trust_level: "高速タイパーを自動的に投稿禁止する最高信頼レベル"
+    auto_silence_first_post_regex: "大文字と小文字を区別しない正規表現。合格すると、ユーザーの最初の投稿は投稿禁止になり、承認キューに送られます。例: aging|a[bc]a はまず、「raging」または「aba」または「aca」を含むすべての投稿を投稿禁止にします。最初の投稿のみに適用されます。使用廃止: 代わりに「ウォッチ語の投稿禁止」を使用してください"
+    reviewable_claiming: "レビュー待ちコンテンツは、対応前に割り当てられる必要があるかどうか"
+    reviewable_default_topics: "デフォルトでレビュー待ちコンテンツをトピック別にグループ化して表示する"
+    reviewable_default_visibility: "レビュー待ち項目がこの優先度を満たさない場合、それを表示しない"
+    reviewable_low_priority_threshold: "優先度フィルターは、'(すべて)' フィルターが使用されていない限り、このスコアを満たさないレビュー待ち項目を非表示にする。"
+    high_trust_flaggers_auto_hide_posts: "新しいユーザーの投稿は、TL3 以上のユーザーが迷惑として通報した後、自動的に非表示になる"
+    cooldown_hours_until_reflag: "ユーザーが投稿をもう一度通報できるまでの時間"
+    slow_mode_prevents_editing: "editing_grace_period の後、'低速モード' で編集を防止するかどうか"
     reply_by_email_enabled: "メールでのトピックへの返信を有効化します。"
+    reply_by_email_address: "メールによる返信の受信メールアドレスのテンプレート。例: %%{reply_key}@reply.example.com または replies+%%{reply_key}@example.com"
+    alternative_reply_by_email_addresses: "メールによる返信の受信メールアドレスの代替テンプレートのリスト。例: %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
+    incoming_email_prefer_html: "受信メールにテキストの代わりに HTML を使用する。"
+    strip_incoming_email_lines: "受信メールの各行から先頭と末尾の空白を削除する。"
+    disable_emails: "Discourse があらゆる種類のメールを送信しないようにする。'はい' を選択するとすべてのユーザーのメールが無効になります。'スタッフ以外' を選択すると、スタッフ以外のユーザーのみのメールを無効にします。"
     strip_images_from_short_emails: "2800 バイト未満のメールから画像を削除します。"
     short_email_length: "短いメールのバイト数"
+    display_name_on_email_from: "email from フィールドにフルネームを表示する"
+    unsubscribe_via_email: "件名または本文に 'unsubscribe' を含めてメールを送信することで、ユーザーがメールの購読を解除できるようにする"
+    unsubscribe_via_email_footer: "送信されるメールのフッターにメールで購読解除の mailto: リンクを添付する"
+    delete_email_logs_after_days: "(N) 日後にメールログを削除する。0 に設定すると無期限に保持します"
+    disallow_reply_by_email_after_days: "(N) 日後のメールによる返信を許可しない。0 に設定すると無限に保持します"
+    max_emails_per_day_per_user: "1 日にユーザーに送信されるメールの最大数。0 を設定すると、制限が無効になります"
+    enable_staged_users: "受信メールを処理するときにステージングユーザーを自動的に作成する。"
+    maximum_staged_users_per_email: "受信メールを処理するときに作成されるステージングユーザーの最大数。"
+    auto_generated_allowlist: "自動生成コンテンツがチェックされないメールアドレスのリスト。例: foo@bar.com|discourse@bar.com"
+    block_auto_generated_emails: "自動生成として識別された受信メールをブロックする。"
+    ignore_by_title: "件名に基づいて受信メールを無視する。"
+    mailgun_api_key: "Webhook メッセージを検証するために使用される Mailgun Secret API キー。"
+    soft_bounce_score: "一時的なバウンスが発生したときにユーザーに追加されるバウンススコア。"
+    hard_bounce_score: "永久的なバウンスが発生したときにユーザーに追加されるバウンススコア。"
+    bounce_score_threshold: "ユーザーへのメール送信を停止する最大バウンススコア。"
+    reset_bounce_score_after_days: "X 日後にバウンススコアを自動的にリセットする。"
+    blocked_attachment_content_types: "コンテンツタイプに基づいて添付ファイルをブロックするために使用されるキーワードのリスト。"
+    blocked_attachment_filenames: "ファイル名に基づいて添付ファイルをブロックするために使用されるキーワードのリスト。"
+    forwarded_emails_behaviour: "Discourse に転送されたメールの処理方法"
+    always_show_trimmed_content: "受信メールのトリミングされた部分を常に表示する。警告: メールアドレスが表示される可能性があります。"
+    trim_incoming_emails: "受信メールの関連性のない部分をトリミングする。"
+    private_email: "投稿またはトピックのコンテンツをメールの件名または本文に含めない。注意: ダイジェストメールも無効にします。"
+    email_total_attachment_size_limit_kb: "送信メールに添付されたファイルの最大合計サイズ (kB)。0 に設定すると、添付ファイルの送信が無効になります。"
+    post_excerpts_in_emails: "通知メールで、常に投稿全文の代わりに抜粋を送信する"
+    raw_email_max_length: "受信メールに格納される必要のある文字数。"
+    raw_rejected_email_max_length: "拒否された受信メールに格納される必要のある文字数。"
+    delete_rejected_email_after_days: "(n) 日間経過した拒否メールを削除する。"
+    manual_polling_enabled: "メール返信用の API を使用してメールをプッシュする。"
     pop3_polling_enabled: "メール返信のために POP3 をポーリングします。"
     pop3_polling_ssl: "POP3 サーバーへ SSL 接続します (推奨)。"
+    pop3_polling_openssl_verify: "TLS サーバー証明書を確認する (デフォルト: 有効)"
     pop3_polling_period_mins: "POP3 アカウントのメールを確認する期間 (分)。注意: 再起動が必要です。"
     pop3_polling_port: "ポーリングを行う POP3 アカウントのポートです。"
     pop3_polling_host: "ポーリングを行う POP3 のホストです。"
     pop3_polling_username: "ポーリングを行う POP3 アカウントのユーザー名です。"
     pop3_polling_password: "ポーリングを行う POP3 アカウントのパスワードです。"
+    pop3_polling_delete_from_server: "サーバーからメールを削除する。注意: これを無効にした場合、メールの受信トレイを手動でクリーンアップする必要があります"
+    log_mail_processing_failures: "すべてのメール処理の失敗を <a href='%{base_path}/logs' target='_blank'>/logs</a> に記録する"
+    email_in: 'ユーザーがメールによって新規トピックを投稿することを許可する (手動または pop3 ポーリングが必要です)。各カテゴリの "設定" タブでアドレスを構成します。'
     email_in_min_trust: "メールでのトピック作成を許可する最低信頼レベル"
+    email_in_authserv_id: "受信メールに認証チェックを実行するサービスの識別子。この構成方法については、<a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> をご覧ください。"
+    email_in_spam_header: "迷惑を検出するためのメールヘッダー。"
+    enable_imap: "グループメッセージを同期するために IMAP を有効にする。"
+    enable_imap_write: "双方向の IMAP 同期を有効にする。無効にすると、IMAP アカウントのすべての書き込み操作が無効になります。"
+    enable_imap_idle: "IMAP IDLE メカニズムを使用して新規メールを待機する。"
+    enable_smtp: "グループメッセージの通知を送信するための SMTP を有効にする。"
+    imap_polling_period_mins: "IMAP アカウントでメールを確認する間隔 (分)。"
+    imap_polling_old_emails: "IMAP ボックスがポーリングされるたびに更新される古いメール (処理済み) の最大数 (すべての場合は 0)。"
+    imap_polling_new_emails: "IMAP ボックスがポーリングされるたびに更新される新しいメール (未処理) の最大数。"
+    imap_batch_import_email: "インポートモードをトリガーする新しいメールの最低数 (投稿アラートを無効にします)。"
     email_prefix: "メールの件名に使用される [label]。空白の場合、'title' がデフォルトで使用されます。"
     email_site_title: "サイトからのメールの送信者として使用されるサイトのタイトル。 空白の場合、'title' がデフォルトで使用されます。'title' にメールの送信者として使用できない文字列が含まれている場合、この設定を使用します。"
+    find_related_post_with_key: "'reply key' のみを使って返信先の投稿を検索する。警告: これを無効にすると、メールアドレスに基づいてユーザー代理操作が可能になります。"
     minimum_topics_similar: "新規トピックを作成する際に類似トピックを表示するため必要な既存のトピックの数です。"
     relative_date_duration: "投稿後、投稿日が相対表示 (例: 7 日) から絶対表示 (2 月 20 日) に変わるまでの日数。"
     delete_user_max_post_age: "最初の投稿が (x) 日間以上前であるユーザーは削除しない"
     delete_all_posts_max: "[すべての投稿を削除] ボタンで一度に削除可能な最大投稿数。ユーザーがここで指定した以上の投稿を作成していた場合は、全投稿をまとめて削除することができません。またユーザーも削除されません。"
+    delete_user_self_max_post_count: "セルフサービスのアカウント削除を許可しているときにユーザーが持つことのできる投稿の最大数。-1 を設定するとセルフサービスのアカウント削除が無効になります。"
+    username_change_period: "アカウントがユーザー名を変更できる、登録後の最大日数 (0 に設定すると、ユーザー名の変更を禁止にします)。"
     email_editable: "登録後、ユーザーにメールアドレスの変更を許可します。"
+    logout_redirect: "ログアウト後のブラウザのリダイレクト先 (例: https://example.com/logout)"
     allow_uploaded_avatars: "ユーザーにカスタムプロフィール画像のアップロードを許可します。"
     default_avatars: "新規ユーザーが変更するまで使用されるデフォルトのアバターの URL です。"
     automatically_download_gravatars: "アカウントの作成時またはメールアドレスの変更時にユーザーの Gravatar をダウンロードします。"
+    digest_topics: "メールの要約に表示する人気のあるトピックの最大数。"
+    digest_posts: "メールの要約に表示する人気のある投稿の最大数。"
+    digest_other_topics: "メールの要約の 'フォローしているトピックとカテゴリの新着' セクションに表示されるトピックの最大数。"
+    digest_min_excerpt_length: "メールの要約に記載されている投稿の抜粋の最低文字数。"
+    suppress_digest_email_after_days: "(n) 日以上サイトにアクセスしていないユーザーの要約メールを非表示する。"
+    digest_suppress_categories: "要約メールからこれらのカテゴリを非表示にする。"
+    disable_digest_emails: "すべてのユーザーの要約メールを無効にする。"
+    apply_custom_styles_to_digest: "カスタムメールテンプレートと CSS は要約メールに適用されます。"
+    email_accent_bg_color: "HTML メールの一部の要素の背景に使用されるアクセントカラー。色名 ('red') または 16 進数値 ('#FF0000') を入力してください。"
+    email_accent_fg_color: "HTML メールのメール背景色にレンダリングされるテキストの色。色名 ('white') または 16 進数値 ('#FFFFFF') を入力してください。"
+    email_link_color: "HTML メールのリンクの色。色名 ('blue') または 16 進数値 ('#0000FF') を入力してください。"
     detect_custom_avatars: "ユーザーがカスタムプロフィール画像をアップロードしたかを確認するかどうか。"
     max_daily_gravatar_crawls: "Discourse が 1 日に Gravatar でカスタムアバターの有無をチェックする回数の上限"
+    public_user_custom_fields: "API で取得できるユーザーカスタムフィールドのリスト。"
+    staff_user_custom_fields: "API でスタッフメンバー用に取得できるユーザーカスタムフィールドのリスト。"
     enable_user_directory: "閲覧用のユーザーディレクトリを提供"
+    enable_group_directory: "閲覧用のグループディレクトリを提供"
+    enable_category_group_moderation: "グループが特定のカテゴリのコンテンツに介入することを許可する"
+    group_in_subject: "メールの件名の %{optional_pm} を PM の最初のグループの名前に設定する。「<a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>標準メールの件名のフォーマットをカスタマイズする</a>」をご覧ください。"
     allow_anonymous_posting: "ユーザーに匿名モードへの切り替えを許可"
     anonymous_posting_min_trust_level: "匿名で投稿するために必要な最低信頼レベル"
     anonymous_account_duration_minutes: "匿名性を守るため、N 分毎に各ユーザーの匿名アカウントを作成しなおします。例 : 600 に設定すると、最終投稿から 600 分が経過し、さらにユーザーが匿名に切り替えると、新しい匿名アカウントが作成されます。"
+    hide_user_profiles_from_public: "匿名ユーザーのユーザーカード、ユーザープロフィール、およびユーザーディレクトリを無効にする。"
+    allow_users_to_hide_profile: "ユーザーがプロフィールとプレゼンスを非表示することを許可する"
+    allow_featured_topic_on_user_profiles: "ユーザーがトピックへのリンクをユーザーカードとプロフィールに掲載することを許可する。"
+    show_inactive_accounts: "ログインユーザーが非アクティブアカウントのプロフィールを閲覧することを許可する。"
+    hide_suspension_reasons: "ユーザープロフィールに凍結理由を公開しない。"
+    log_personal_messages_views: "管理者による他のユーザー/グループの個人メッセージビューをログに記録する。"
+    ignored_users_count_message_threshold: "特定のユーザーがこの数のユーザーに無視された場合、モデレーターに通知する。"
+    ignored_users_message_gap_days: "多数のユーザーによって無視されたユーザーについてモデレーターに再通知するまでの時間。"
+    clean_up_inactive_users_after_days: "非アクティブユーザー (投稿のない信頼レベル 0) が削除されるまでの日数。クリーンアップを無効にするには、0 に設定します。"
+    clean_up_unused_staged_users_after_days: "未使用のステージングユーザー (投稿なし) が削除されるまでの日数。クリーンアップを無効にするには、0 に設定します。"
+    user_selected_primary_groups: "ユーザーが独自のプライマリーグループを設定することを許可する"
+    max_notifications_per_user: "ユーザー当たりの通知の最大数。この数を超えると、古い通知は削除されます。毎週適用されます。0 に設定すると無効になります"
+    allowed_user_website_domains: "ユーザーのウェブサイトはこれらのドメインに対して検証されます。パイプ区切りのリスト。"
     allow_profile_backgrounds: "ユーザーにプロフィール背景のアップロードを許可します。"
+    sequential_replies_threshold: "連続返信が多すぎることを通知されるまでに、ユーザーがトピックで連続して作成できる投稿数。"
+    get_a_room_threshold: "警告を受けるまでに、ユーザーが同じトピックの同じ人物に行える投稿数。"
     enable_mobile_theme: "モバイルデバイスにモバイル対応のテーマを使用します (デスクトップサイトに切り替え可能)。完全にレスポンシブなカスタムスタイルシートを使用する場合はこの設定を無効にしてください。"
     dominating_topic_minimum_percent: "ユーザーがトピックを過度に占領していることを通知する、トピック内のユーザーの投稿率。"
+    disable_avatar_education_message: "アバターを変更するためのチュートリアルメッセージを無効にする。"
     suppress_uncategorized_badge: "トピックリストに未分類のトピックのバッジを表示しない"
+    header_dropdown_category_count: "ヘッダードロップダウンメニューに表示できるカテゴリ数。"
+    permalink_normalizations: "パーマリンクを照合する前に、次の正規表現を適用する。例: /(topic.*)\\?.*/\\1 はトピックルートからクエリ文字列を削除します。形式は正規表現+文字列です。キャプチャにアクセスするには \\1 などを使用します"
+    global_notice: "すべての訪問者に緊急で非常の閉じられないグローバルバナー通知を表示する。空白にすると非表示になります (HTML 可)。"
     disable_system_edit_notifications: "download_remote_images_to_local' が有効である場合、システムユーザーによる編集の通知を無効にします。"
+    notification_consolidation_threshold: "複数の通知が 1 つの通知に統合される前に受信した「いいね！」またはメンバーシップリクエストの通知の数。"
+    likes_notification_consolidation_window_mins: "しきい値に達すると「いいね！」された複数の通知が 1 つの通知に統合される期間 (分)。しきい値は `SiteSetting.notification_consolidation_threshold` で構成できます。"
+    automatically_unpin_topics: "ユーザーが最後に達したら、自動的にトピックの固定表示を解除する。"
+    read_time_word_count: "推定読了時間を計算するための 1 分あたりの語数。"
+    topic_page_title_includes_category: "トピックページの<a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>タイトルタグ</a>にはカテゴリ名が含まれます。"
+    native_app_install_banner_ios: "iOS デバイスの DiscourseHub アプリバナーを通常のユーザー (信頼レベル 1 以上) に表示する。"
+    native_app_install_banner_android: "Android デバイスの DiscourseHub アプリバナーを通常のユーザー (信頼レベル 1 以上) に表示する。"
+    app_association_android: "Google の Digital Asset Links API に使用される <a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a> エンドポイントのコンテンツ。"
+    app_association_ios: "このサイトと iOS アプリの間にユニバーサルリンクを作成するために使用される <a href='%{base_path}/apple-app-site-association'>apple-app-site-association</a> エンドポイントのコンテンツ。"
+    share_anonymized_statistics: "匿名化された使用統計を共有する。"
+    auto_handle_queued_age: "この日数後に、レビュー待ちのレコードを自動的に処理する。通報は無視されます。キューに入れられた投稿とユーザーは拒否されます。0 に設定するとこの機能は無効になります。"
+    penalty_step_hours: "ユーザーの投稿禁止または凍結に使用されるデフォルトのペナルティ (時間)。最初の違反はデフォルトで最初の値になり、2 番目の違反はデフォルトで 2 番目の値になります。"
+    svg_icon_subset: "アセットに含める追加の FontAwesome 5 アイコンを追加する。ソリッドアイコンには 'fa-'、通常のアイコンには 'far-'、ブランドアイコンには 'fab-' のプレフィックスを使用します。"
+    max_prints_per_hour_per_user: "/print ページの最大インプレッション数 (0 に設定すると無効になります)"
     full_name_required: "ユーザープロフィールのフルネームを必須にします。"
     enable_names: "ユーザーのプロフィール、ユーザーカード、メールアドレスでのフルネームを表示します。無効にすると、フルネームはすべての場所で非表示になります。"
     display_name_on_posts: "投稿に、@username に加えてユーザーのフルネームを表示します。"
     show_time_gap_days: "２つの投稿の作成日の間が指定された日数以上の場合、トピックに時間の差を表示します。"
     short_progress_text_threshold: "トピック内の投稿数が指定された数字を超えると、プログレスバーに現在の投稿番号のみを表示します。プログレスバーの幅を変更すると、この値を変更する必要がある場合があります。"
+    default_code_lang: "Github コードブロックにデフォルトで適用されるプログラム言語シンタックスハイライト (auto、nohighlight、ruby、python など)"
     warn_reviving_old_topic_age: "最後の返信が指定された日数より古いトピックに返信し始めると、警告を表示します。0 に設定すると無効になります。"
     autohighlight_all_code: "明示的に言語を指定しなくても、すべての整形済みのコードブロックにコードハイライトを強制的に適用します。"
+    highlighted_languages: "シンタックスハイライトルールが含まれる。(警告: 多くの言語を含めすぎると、パフォーマンスに影響を与える可能性があります) デモは、<a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a> をご覧ください。"
+    show_copy_button_on_codeblocks: "コードブロックのコンテンツをユーザーのクリップボードにコピーするためのボタンをコードブロックに追加する。この機能は Internet Explorer ではサポートされていません。"
+    embed_any_origin: "オリジンに関係なく、埋め込み可能なコンテンツを許可する。これは静的 HTML を使用するモバイルアプリに必要です。"
+    embed_topics_list: "トピックリストの HTML 埋め込みをサポートする"
+    embed_set_canonical_url: "埋め込みトピックの正規 URL を埋め込みコンテンツの URL に設定する。"
     embed_truncate: "埋め込まれた投稿切り捨てます。"
+    embed_unlisted: "インポートされたトピックはユーザーが返信するまでリストされません。"
+    embed_support_markdown: "埋め込まれた投稿の Markdown フォーマット設定をサポートする。"
+    allowed_embed_selectors: "埋め込みに使用できる CSS 要素のカンマ区切りリスト。"
+    allowed_href_schemes: "http と https のほかにリンクに使用できるスキーム。"
     embed_post_limit: "埋め込める投稿の最大数。"
+    embed_username_required: "トピック作成用のユーザー名が必要です。"
+    notify_about_flags_after: "この時間の経過後に未処理の通報がある場合、モデレーターに個人メッセージを送信する。無効にするには 0 に設定します。"
     show_create_topics_notice: "サイトの公開トピック数が 5 件未満である場合、管理者にトピックを作成するかどうかを尋ねる通知を表示します。"
     delete_drafts_older_than_n_days: "(n) 日間経過した下書きを削除します。"
+    delete_merged_stub_topics_after_days: "完全にマージされたスタブトピックを自動的に削除するまで待機する日数。0 に設定すると、スタブトピックは削除されません。"
+    bootstrap_mode_min_users: "ブートストラップモードを無効にするために必要な最低ユーザー数 (0 に設定すると無効になります)"
+    prevent_anons_from_downloading_files: "匿名ユーザーが添付ファイルをダウンロードできないようにする。"
+    secure_media: 'すべてのアップロード (画像、動画、音声、テキスト、pdf、zip など) へのアクセスを制限する。“login required” が有効である場合、ログイン済みのユーザーのみがアップロードにアクセスできます。そうでない場合は、個人メッセージと非公開カテゴリのメディアアップロードのアクセスのみが制限されます。警告: この設定は複雑であるため、管理を十分に理解している必要があります。詳細については、<a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">メタに関するセキュリティで保護されたメディアのトピック</a>をご覧ください。'
+    secure_media_allow_embed_images_in_emails: "通常はメールで編集されるセキュリティで保護された画像のサイズが 'secure media max email embed image size kb' 設定よりも小さい場合、その埋め込みを許可する。"
+    secure_media_max_email_embed_image_size_kb: "'secure media allow embed in emails' 設定が有効である場合にメールに埋め込まれるセキュリティで保護された画像のサイズのカットオフ。その設定が有効でない場合、この設定の効果はありません。"
     slug_generation_method: "スラッグ生成方法を選択します。'encode' はパーセントエンコード文字列を生成します。'none'は、スラッグを無効にします。"
     enable_emoji: "絵文字を有効にする"
+    enable_emoji_shortcuts: ":) :p :( などの一般的なスマイリーテキストは絵文字に変換されます"
     emoji_set: "絵文字はどうですか？"
+    emoji_autocomplete_min_chars: "絵文字の自動補完ポップアップをトリガーするために必要な最低文字数"
+    enable_inline_emoji_translation: "インライン絵文字の翻訳を有効にする (前にスペースや句読点を使用しない)"
+    approve_post_count: "承認が必要な新規またはベーシックユーザーの投稿数"
     approve_unless_trust_level: "この信頼レベル以下のユーザーの投稿には承認が必要"
+    approve_new_topics_unless_trust_level: "この信頼レベル以下のユーザーの新規トピックに承認を必要とする"
+    approve_unless_staged: "ステージングユーザーの新規トピックと投稿に承認を必要とする"
+    notify_about_queued_posts_after: "この時間以上レビュー待ち状態の投稿がある場合、すべてのモデレーターに通知を送信する。0 に設定するとこれらの通知が無効になります。"
+    auto_close_messages_post_count: "メッセージが自動的にクローズされるまでに許可される投稿の最大数 (0 に設定すると無効になります)"
+    auto_close_topics_post_count: "トピックが自動的にクローズされるまでに許可される投稿の最大数 (0 に設定すると無効になります)"
+    auto_close_topics_create_linked_topic: "'auto close topics post count' 設定に基づいてトピックが自動クローズするときに、リンクされた新しいトピックを作成する"
+    code_formatting_style: "コンポーザーのコードボタンはデフォルトでこのコード書式設定スタイルになります"
+    max_allowed_message_recipients: "メッセージに許可される最大受信者数。"
+    watched_words_regular_expressions: "ウォッチ語は正規表現です。"
+    enable_diffhtml_preview: "完全な再レンダリングの代わりに diffHTML を使ってプレビューを同期する実験的機能"
+    old_post_notice_days: "投稿の通知が古くなるまでの日数"
+    new_user_notice_tl: "新しいユーザーの投稿通知を閲覧するために必要な最低信頼レベル。"
+    returning_user_notice_tl: "リピートユーザーの投稿通知を閲覧するために必要な最低信頼レベル。"
+    returning_users_days: "ユーザーがリピートとみなされる経過日数。"
+    review_media_unless_trust_level: "スタッフは、信頼レベルの低いユーザーの投稿に埋め込みメディアが含まれているかどうかをレビューします。"
+    blur_tl0_flagged_posts_media: "通報された投稿の画像をぼかして、潜在的に NSFW のコンテンツを非表示にする。"
+    enable_page_publishing: "スタッフメンバーが独自のスタイルを使ったトピックを新しい URL に公開することを許可する。"
+    show_published_pages_login_required: "匿名ユーザーは、ログインが必要な場合でも、公開されたページを閲覧できる。"
     skip_auto_delete_reply_likes: "古い返信を自動的に削除する場合は、この数以上の「いいね！」がある投稿の削除をスキップします。"
+    default_email_digest_frequency: "デフォルトで、ユーザーが要約メールを受信する頻度。"
+    default_include_tl0_in_digests: "デフォルトで、新しいユーザーの投稿を要約メールに含める。ユーザーは設定でこれを変更できます。"
+    default_email_level: "通常トピックのデフォルトのメール通知レベルを設定する。"
+    default_email_messages_level: "誰かがユーザーにメッセージを送信した場合のデフォルトのメール通知レベルを設定する。"
+    default_email_mailing_list_mode: "デフォルトで新しい投稿があるたびにメールを送信する。"
+    default_email_mailing_list_mode_frequency: "メーリングリストモードを有効にしたユーザーはデフォルトで、この頻度でメールを受信する。"
+    disable_mailing_list_mode: "ユーザーによるメーリングリストモードの有効化を禁止する (メーリングリストのメールは送信されなくなります)。"
     default_email_previous_replies: "デフォルトでメールに以前の返信を含めます。"
+    default_email_in_reply_to: "デフォルトで、投稿への返信の抜粋をメールに含める。"
+    default_other_new_topic_duration_minutes: "トピックが新規とみなされるグローバルのデフォルト条件。"
+    default_other_auto_track_topics_after_msecs: "トピックが自動的に追跡されるまでのグローバルのデフォルト時間。"
+    default_other_notification_level_when_replying: "ユーザーがトピックに返信する際のグローバルのデフォルト通知レベル。"
+    default_other_external_links_in_new_tab: "デフォルトで、外部リンクを新しいタブで開く。"
+    default_other_enable_quoting: "デフォルトで、選択したテキストを引用して返信する。"
+    default_other_enable_defer: "デフォルトで、トピックの延期機能を有効にする。"
+    default_other_dynamic_favicon: "デフォルトで、ブラウザアイコンに新規/更新されたトピック数を表示する。"
     default_other_skip_new_user_tips: "新規ユーザーオンボーディングのヒントとバッジをスキップします。"
+    default_other_like_notification_frequency: "デフォルトで「いいね！」をユーザーに通知する"
+    default_topics_automatic_unpin: "ユーザーが最後に達したら、デフォルトで自動的にトピックの固定表示を解除する。"
+    default_categories_watching: "デフォルトでウォッチされるカテゴリのリスト。"
+    default_categories_tracking: "デフォルトで追跡されるカテゴリのリスト。"
+    default_categories_muted: "デフォルトでミュートされるカテゴリのリスト。"
+    default_categories_watching_first_post: "デフォルトで新規トピックの最初の投稿がウォッチされるカテゴリのリスト。"
+    default_categories_regular: "デフォルトでミュートされないカテゴリのリスト。`mute_all_categories_by_default` サイト設定が有効である場合に役立ちます。"
+    mute_all_categories_by_default: "すべてのカテゴリのデフォルトの通知レベルをミュートに設定する。カテゴリが '最新' と 'カテゴリ' ページに表示されるように、ユーザーがカテゴリを選択する必要があります。匿名ユーザーのデフォルトを変更する場合は、'default_categories_' 設定を設定してください。"
+    default_tags_watching: "デフォルトでウォッチされるタグのリスト。"
+    default_tags_tracking: "デフォルトで追跡されるタグのリスト。"
+    default_tags_muted: "デフォルトでミュートされるタグのリスト。"
+    default_tags_watching_first_post: "デフォルトで新規トピックの最初の投稿がウォッチされるタグのリスト。"
+    default_text_size: "デフォルトで選択されるテキストサイズ"
+    default_title_count_mode: "ページタイトルカウンターのデフォルトモード"
+    retain_web_hook_events_period_days: "Webhook イベントレコードを保持する日数。"
+    retry_web_hook_events: "失敗した Webhook イベントを自動的に 4 回再試行する。再試行間の時間差は、1、5、25、および 125 分です。"
+    revoke_api_keys_days: "未使用の API キーが自動的に取り消されるまでの日数 (0 に設定すると取り消されません)"
+    allow_user_api_keys: "ユーザー API キーの生成を許可する"
+    allow_user_api_key_scopes: "ユーザー API キーに許可されるスコープのリスト"
+    min_trust_level_for_user_api_key: "ユーザー API キーの生成に必要な信頼レベル"
+    allowed_user_api_auth_redirects: "ユーザー API キーの認証リダイレクトに許可された URL。任意の部分を照合するには、ワイルドカード記号 * を使用できます (例: www.example.com/*)。"
+    allowed_user_api_push_urls: "ユーザー API へのサーバープッシュで許可される URL"
+    expire_user_api_keys_days: "ユーザー API キーが自動的に期限切れになるまでの日数 (0 に設定すると期限切れになりません)"
     tagging_enabled: "トピックでタグを有効にしますか？"
+    min_trust_to_create_tag: "タグを作成するために必要な最低信頼レベル。"
+    max_tags_per_topic: "トピックに適用できる最大タグ数。"
+    max_tag_length: "タグに使用できる最大文字数。"
+    max_tag_search_results: "タグを検索する際に表示する結果の最大件数。"
+    max_tags_in_filter_list: "フィルタのドロップダウンに表示するタグの最大数。最も使用されているタグが表示されます。"
+    tags_sort_alphabetically: "タグをアルファベット順に表示する。デフォルトでは人気順に表示されます。"
+    tags_listed_by_group: "<a href='%{base_path}/tags' target='_blank'>タグページ</a>にタググループごとにタグをリストする。"
     tag_style: "タグバッジの視覚的スタイル"
+    allow_staff_to_tag_pms: "スタッフメンバーが個人メッセージにタグ付けすることを許可する"
+    min_trust_level_to_tag_topics: "トピックのタグ付けに必要な最低信頼レベル"
+    suppress_overlapping_tags_in_list: "タグがトピックタイトルの語に完全に一致する場合、タグを表示しない"
+    remove_muted_tags_from_latest: "ミュートされたタグのみがタグ付けされたトピックを最新のトピックリストに表示しない。"
+    force_lowercase_tags: "すべての新しいタグが完全に小文字になるように強制する。"
+    company_name: "会社名"
+    governing_law: "準拠法"
+    city_for_disputes: "紛争都市"
+    shared_drafts_category: "トピック下書き用のカテゴリを指定して、共有下書き機能を有効にする。このカテゴリのトピックは、スタッフユーザーのトピックリストから除外されます。"
+    shared_drafts_min_trust_level: "ユーザーが共有下書きを閲覧して編集することを許可する。"
+    push_notifications_prompt: "ユーザー同意プロンプトを表示する。"
+    push_notifications_icon: "通知コーナーに表示されるバッジアイコン。透明度が適用された 96x96 のモノクロ PNG が推奨されます。"
+    base_font: "サイトのほとんどのテキストに使用されるベースフォント。テーマは `--font-family` CSS カスタムプロパティを介してオーバーライドできます。"
+    heading_font: "サイトの見出しに使用されるフォント。テーマは `--heading-font-family` CSS カスタムプロパティを介してオーバーライドできます。"
+    short_title: "短いタイトルはユーザーのホーム画面、ランチャー、またはスペースが限られている場所に使用されます。12 文字に制限する必要があります。"
+    dashboard_hidden_reports: "ダッシュボードから指定されたレポートを非表示にすることを許可する。"
+    dashboard_visible_tabs: "表示するダッシュボードのタブを選択します。"
+    dashboard_general_tab_activity_metrics: "アクティビティメトリクスとして一般タブに表示されるレポートを選択します。"
+    gravatar_name: "Gravatar プロバイダーの名前"
+    gravatar_base_url: "Gravatar プロバイダーの API ベースの URL"
+    gravatar_login_url: "gravatar_base_url への相対 URL。ユーザーに Gravatar サービスへのログインを提供します"
+    share_quote_buttons: "引用の共有ウィジェットに表示される項目と表示順を決定する。"
+    share_quote_visibility: "引用の共有ボタンをいつ表示するかを決定する: 表示しない、匿名ユーザーのみ、またはすべてのユーザー。 "
+    create_revision_on_bulk_topic_moves: "トピックが新しいカテゴリに一括して移動されたときに、最初の投稿のリビジョンを作成する。"
+    allow_changing_staged_user_tracking: "ステージングユーザーのカテゴリとタグの通知設定を管理者ユーザーが変更することを許可する。"
     errors:
       invalid_email: "無効なメールアドレスです。"
       invalid_username: "そのユーザー名のユーザは存在しません。"
+      invalid_group: "その名前のグループは存在しません。"
       invalid_integer_min_max: "値は %{min} から %{max} の間である必要があります。"
       invalid_integer_min: "値は %{min} 以上である必要があります。"
       invalid_integer_max: "値は %{max} を超えることはできません。"
@@ -1474,35 +2045,91 @@ ja:
       invalid_string_min_max: "文字数は %{min} から %{max} の間である必要があります。"
       invalid_string_min: "少なくとも %{min} 文字である必要があります。"
       invalid_string_max: "%{max} 文字以下である必要があります。"
+      invalid_json: "無効な JSON。"
       invalid_reply_by_email_address: "値に '%{reply_key}' を含める必要があり、通知メールとは異なる必要があります。"
+      invalid_alternative_reply_by_email_addresses: "すべての値には '%{reply_key}' が含まれている必要があり、通知メールとは異なるものである必要があります。"
+      pop3_polling_host_is_empty: "POP3 ポーリングを有効にする前に、'pop3 polling host' を設定する必要があります。"
+      pop3_polling_username_is_empty: "POP3 ポーリングを有効にする前に、'pop3 polling username' を設定する必要があります。"
+      pop3_polling_password_is_empty: "POP3 ポーリングを有効にする前に、'pop3 polling password' を設定する必要があります。"
+      pop3_polling_authentication_failed: "POP3 認証に失敗しました。pop3 の資格情報を確認してください。"
+      reply_by_email_address_is_empty: "メールによる返信を有効にする前に、'reply by email address' を設定する必要があります。"
+      email_polling_disabled: "メールによる返信を有効にする前に、手動または POP3 ポーリングのいずれかを有効にする必要があります。"
+      user_locale_not_enabled: "この設定を有効にする前に 'allow user locale' を有効にする必要があります。"
+      invalid_regex: "正規表現が無効であるか、許可されていません。"
+      email_editable_enabled: "この設定を有効にする前に 'email editable' を無効にする必要があります。"
+      staged_users_disabled: "この設定を有効にする前に 'staged users' を有効にする必要があります。"
+      reply_by_email_disabled: "この設定を有効にする前に 'reply by email' を有効にする必要があります。"
+      discourse_connect_url_is_empty: "この設定を有効にする前に 'discourse connect url' を設定する必要があります。"
+      discourse_connect_invite_only: "DiscourseConnect と invite only を同時に有効にすることはできません。"
+      enable_local_logins_disabled: "この設定を有効にする前に 'enable local logins' を有効にする必要があります。"
+      min_username_length_exists: "最も短いユーザー名 (%{username}) を超える最小のユーザー名の長さを設定することはできません。"
       min_username_length_range: "最小値を最大値より上にすることはできません。"
+      max_username_length_exists: "最も長いユーザー名 (%{username}) を下回る最大のユーザー名の長さを設定することはできません。"
+      max_username_length_range: "最大値を最小値よりも小さくすることはできません。"
+      invalid_hex_value: "色値は 6 桁の 16 進数コードである必要があります。"
+      empty_selectable_avatars: "この設定を有効にする前に、少なくとも 2 つの選択可能なアバターをアップロードする必要があります。"
+      category_search_priority:
+        low_weight_invalid: "重みを 1 以上に設定することはできません。"
+        high_weight_invalid: "重みを 1 以下に設定することはできません。"
+      allowed_unicode_usernames:
+        regex_invalid: "正規表現は無効です: %{error}"
+        leading_trailing_slash: "正規表現の開始と終了にスラッシュを使用してはいけません。"
+      unicode_usernames_avatars: "内部システムのアバターは Unicode のユーザー名をサポートしていません。"
+      list_value_count: "リストには正確に %{count} この値が含まれている必要があります。"
+    placeholder:
+      discourse_connect_provider_secrets:
+        key: "www.example.com"
+        value: "DiscourseConnect シークレット"
   search:
+    extreme_load_error: "サイトに極端な負荷がかかっているため、検索が無効になっています。後でもう一度お試しください。"
     within_post: "%{username} の #%{post_number}"
     types:
       category: "カテゴリ"
       topic: "結果"
       user: "ユーザー"
+    results_page: "'%{term}' の検索結果"
+    audio: "[audio]"
+    video: "[video]"
   discourse_connect:
+    login_error: "ログインエラー"
     not_found: "あなたのアカウントが見つかりませんでした。サイトの管理者にお問い合わせください。"
+    account_not_approved: "あなたのアカウントは承認待ちです。承認されると、メール通知が届きます。"
     unknown_error: "あなたのアカウントに問題があります。サイトの管理者にお問い合わせください。"
     timeout_expired: "アカウントへのログインがタイムアウトになりました。もう一度ログインしてください。"
     no_email: "メールアドレスが入力されていません。サイトの管理者にお問い合わせください。"
+    blank_id_error: "`external_id` は必須ですが空白になっています"
     email_error: "メールアドレス <b>%{email}</b> でアカウントを登録できませんでした。サイトの管理者にお問い合わせください。"
     missing_secret: "シークレットが欠落しているため、認証に失敗しました。この問題を修正するには、サイト管理者にお問い合わせください。"
     invite_redeem_failed: "招待状の引き換えに失敗しました。サイトの管理者にお問い合わせください。"
   original_poster: "元の投稿者"
-  most_posts: "最も多い投稿"
   most_recent_poster: "最も最近の投稿者"
   frequent_poster: "頻繁な投稿者"
+  poster_description_joiner: "、"
   redirected_to_top_reasons:
     new_user: "コミュニティへようこそ！最も人気のある最近のトピックはこちらです。"
     not_seen_in_a_month: "お帰りなさい！最近見かけませんでしたね。あなたがいない間に最も人気の高かったトピックはこちらです。"
+  merge_posts:
+    edit_reason:
+      other: "%{count} 件の投稿が %{username} によってマージされました"
+    errors:
+      different_topics: "異なるトピックに属する投稿をマージすることはできません。"
+      different_users: "異なるユーザーに属する投稿をマージすることはできません。"
+      max_post_length: "結合された投稿の長さが許容範囲を超えているため、投稿をマージできません。"
   move_posts:
+    new_topic_moderator_post:
+      other: "%{count} 件の投稿は新しいトピックに分割されました: %{topic_link}"
+    new_message_moderator_post:
+      other: "%{count} 件の投稿は新しいメッセージに分割されました: %{topic_link}"
     existing_topic_moderator_post:
       other: "%{count} 件の投稿は次の既存のトピックにマージされました: %{topic_link}"
+    existing_message_moderator_post:
+      other: "%{count} 件の投稿は次の既存のメッセージにマージされました: %{topic_link}"
+  change_owner:
+    post_revision_text: "所有権が譲渡されました"
   publish_page:
     slug_errors:
       blank: "は空にできません"
+      unavailable: "は利用できません"
       invalid: "に無効な文字が含まれています"
   topic_statuses:
     autoclosed_message_max_posts:
@@ -1521,59 +2148,152 @@ ja:
       other: "このトピックは最後の返信から %{count} 時間が経過したので自動的にクローズされました。新たに返信することはできません。"
     autoclosed_enabled_lastpost_minutes:
       other: "このトピックは最後の返信から %{count} 分が経過したので自動的にクローズされました。新たに返信することはできません。"
+    autoclosed_disabled_days:
+      other: "このトピックは %{count} 日後に自動的にオープンになりました。"
+    autoclosed_disabled_hours:
+      other: "このトピックは %{count} 時間後に自動的にオープンになりました。"
+    autoclosed_disabled_minutes:
+      other: "このトピックは %{count} 分後に自動的にオープンになりました。"
+    autoclosed_disabled_lastpost_days:
+      other: "このトピックは最後の返信から %{count} 日後に自動的にオープンになりました。"
+    autoclosed_disabled_lastpost_hours:
+      other: "このトピックは最後の返信から %{count} 時間後に自動的にオープンになりました。"
+    autoclosed_disabled_lastpost_minutes:
+      other: "このトピックは最後の返信から %{count} 分後に自動的にオープンになりました。"
     autoclosed_disabled: "このトピックはオープンになりました。新しい返信を投稿できます。"
     autoclosed_disabled_lastpost: "このトピックはオープンになりました。新しい返信を投稿できます。"
+    auto_deleted_by_timer: "タイマーにより自動的に削除されました。"
   login:
+    invalid_second_factor_method: "選択された二要素方式は無効です。"
+    not_enabled_second_factor_method: "選択された二要素方式は、アカウントで有効になっていません。"
     security_key_description: "物理的なセキュリティキーの準備ができたら、[セキュリティキーで認証] ボタンを押します。"
     security_key_alternative: "別の方法を試してください"
     security_key_authenticate: "セキュリティキーで認証"
     security_key_not_allowed_error: "セキュリティキーの認証プロセスがタイムアウトしたかキャンセルされました。"
     security_key_no_matching_credential_error: "提供されたセキュリティキーに一致する資格情報が見つかりませんでした。"
     security_key_support_missing_error: "現在のデバイスまたはブラウザではセキュリティキーの使用がサポートされていません。別の方法を使用してください。"
+    security_key_invalid: "セキュリティキーを検証中にエラーが発生しました"
     not_approved: "あなたのアカウントはまだ承認されていません。ログインできるようになったら、メールで通知します。"
     incorrect_username_email_or_password: "ユーザー名、メールアドレス、またはパスワードが誤っています"
     incorrect_password: "パスワードが誤っています"
     wait_approval: "ご登録いただきありがとうございます。アカウントが承認され次第メールで通知いたします。"
     active: "アカウントの確認が完了し、利用可能になりました。"
+    activate_email: "<p>ほぼ完了です！<b>%{email}</b> にアクティベーションメールを送信しました。メールに記載の手順に従って、アカウントを確認してください。</p><p>まだ届いていない場合は、迷惑フォルダを確認してください。</p>"
     not_activated: "まだログインできません。確認メールを送信しましたので、メールに記載の指示に従ってあなたのアカウントを有効にしてください。"
     not_allowed_from_ip_address: "その IP アドレスからは %{username} としてログインできません。"
     admin_not_allowed_from_ip_address: "その IP アドレスからは管理者としてログインできません。"
+    reset_not_allowed_from_ip_address: "その IP アドレスからパスワードリセットをリクエストできません。"
     suspended: "%{date} までログインできません。"
     suspended_with_reason: "%{date} までアカウントが凍結されました: %{reason}"
     errors: "%{errors}"
     not_available: "利用できません。%{suggestion}を試しますか？"
     something_already_taken: "エラーが発生しました。ユーザー名またはメールアドレスがすでに登録されている可能性があります。パスワードリセットを行ってください。"
+    omniauth_error:
+      generic: "アカウントを認証中にエラーが発生しました。もう一度やり直してください。"
+      csrf_detected: "認証がタイムアウトしたか、ブラウザを切り替えました。もう一度お試しください。"
+      request_error: "認証を開始中にエラーが発生しました。もう一度お試しください。"
+      invalid_iat: "サーバークロックの差により認証トークンを検証できません。もう一度お試しください。"
+    omniauth_error_unknown: "ログインを処理中に問題が発生しました。もう一度お試しください。"
+    omniauth_confirm_title: "%{provider} を使用してログイン"
     omniauth_confirm_button: "続行"
+    authenticator_error_no_valid_email: "%{account} に関連付けられたメールアドレスは許可されていません。別のメールアドレスでアカウントを構成する必要がある場合があります。"
     new_registrations_disabled: "現在、新しいアカウントの登録を行えません。"
     password_too_long: "パスワードは 200 文字までです。"
     email_too_long: "メールアドレスが長すぎます。メールボックス名は 254 文字以内、ドメイン名は 253 文字以内である必要があります。"
+    wrong_invite_code: "入力した招待コードは間違っています。"
     reserved_username: "そのユーザー名は許可されていません"
     missing_user_field: "すべてのユーザーフィールドに入力されていません。"
     auth_complete: "認証が完了しました。"
     click_to_continue: "ここをクリックして続行します。"
+    already_logged_in: "この招待は既存のアカウントが存在しない新規ユーザーを対象としています。"
     second_factor_title: "二要素認証"
+    second_factor_description: "アプリから要求された認証コードを入力してください。"
     second_factor_backup_description: "バックアップコードの 1 つを入力してください。"
+    second_factor_backup_title: "二要素認証のバックアップコード"
+    invalid_second_factor_code: "無効な認証コードです。コードはそれぞれ一度しか使用できません。"
+    invalid_security_key: "無効なセキュリティキーです。"
+    missing_second_factor_name: "名前を入力してください。"
+    missing_second_factor_code: "コードを入力してください。"
     second_factor_toggle:
+      totp: "代わりに認証アプリまたはセキュリティキーを使用してください"
       backup_code: "代わりにバックアップコードを使用する"
   admin:
     email:
       sent_test: "送信完了！"
+    user:
+      merge_user:
+        updating_username: "ユーザー名を更新中…"
+        changing_post_ownership: "投稿の所有権を変更中…"
+        merging_given_daily_likes: "付与した 1 日の「いいね！」をマージ中…"
+        merging_post_timings: "投稿のタイミングをマージ中…"
+        merging_user_visits: "ユーザーの訪問をマージ中…"
+        updating_site_settings: "サイト設定を更新中…"
+        updating_user_stats: "ユーザー統計を更新中…"
+        merging_user_attributes: "ユーザー属性をマージ中…"
+        updating_user_ids: "ユーザー ID を更新中…"
+        deleting_source_user: "ソースユーザーを削除中…"
   user:
+    deactivated: "'%{email}' からのバウンスメールが多すぎるため無効化されました。"
+    deactivated_by_staff: "スタッフによる無効化"
+    deactivated_by_inactivity:
+      other: "%{count} 日間非アクティブ状態が続いたため自動的に無効化されました"
+    activated_by_staff: "スタッフによる有効化"
+    new_user_typed_too_fast: "新規ユーザーは入力が速すぎます"
+    content_matches_auto_silence_regex: "コンテンツは自動投稿禁止の正規表現に一致します"
+    content_matches_auto_block_regex: "コンテンツは自動ブロックの正規表現に一致します"
     username:
       short: "は少なくとも %{min} 文字である必要があります"
       long: "は %{max} 文字以下である必要があります"
+      too_long: "は長すぎます"
+      characters: "には数字、文字、ダッシュ、ドット、およびアンダースコアのみを含める必要があります"
       unique: "は一意である必要があります"
       blank: "は空にできません"
       must_begin_with_alphanumeric_or_underscore: "は英数字またはアンダースコアで始まる必要があります"
       must_end_with_alphanumeric: "は英数字で終わる必要があります"
+      must_not_contain_two_special_chars_in_seq: "には 2 つ以上の特殊文字 (.-_) のシーケンスを含めることはできません"
+      must_not_end_with_confusing_suffix: "は、.json や .png などの紛らわしいサフィックスで終了することはできません。"
     email:
+      invalid: "は無効です。"
       not_allowed: "はこのメールプロバイダーを許可していません。別のメールアドレスを使用してください。"
       blocked: "は許可されていません。"
+      revoked: "%{date} まで '%{email}' にメールは送信されません。"
       does_not_exist: "該当なし"
     ip_address:
       blocked: "あなたの IP アドレスからの新規登録は許可されていません。"
       max_new_accounts_per_registration_ip: "あなたの IP アドレスからの新規登録は許可されていません (登録可能な数を超えています)。スタッフメンバーにお問い合わせください。"
+    website:
+      domain_not_allowed: "ウェブサイトは無効です。許可されるドメイン: %{domains}"
+    auto_rejected: "年齢により自動的に拒否されました。auto_handle_queued_age サイト設定をご覧ください。"
+    destroy_reasons:
+      unused_staged_user: "未使用のステージングユーザー"
+      fixed_primary_email: "ステージングユーザーの固定プライマリーメール"
+      same_ip_address: "ほかのユーザーと同じ IP アドレス (%{ip_address})"
+      inactive_user: "非アクティブユーザー"
+      reviewable_reject_auto: "キューにあるレビュー待機項目の自動処理"
+      reviewable_reject: "レビュー待ちユーザーを拒否"
+    email_in_spam_header: "ユーザーの最初のメールは迷惑として通報されました"
+    already_silenced: "ユーザーは %{staff} によって %{time_ago}に投稿禁止にされています。"
+    already_suspended: "ユーザーは %{staff} によって %{time_ago}に凍結されています。"
+    cannot_delete_has_posts:
+      other: "ユーザー %{username} には公開トピックまたは個人メッセージに %{count} 件の投稿があるため、削除できません。"
+  reviewables_reminder:
+    submitted:
+      other: "%{count} 時間前に項目が送信されました。[レビューしてください](%{base_path}/review)。"
+    subject_template:
+      other: "%{count} 個の項目にレビューが必要です"
+  unsubscribe_mailer:
+    title: "購読解除メーラー"
+    subject_template: "今後 %{site_title} からの更新メールの受信を希望しないことを確認してください"
+    text_body_template: |
+      誰かが (あなたですか？) %{site_domain_name} からこのアドレスに更新メールを送信しないようリクエストしました。
+      これを確定する場合は、次のリンクをクリックしてください。
+
+      %{confirm_unsubscribe_link}
+
+
+      更新メールの受信を続行する場合は、このメールを無視してかまいません。
   invite_mailer:
+    title: "招待メーラー"
     subject_template: "%{inviter_name} があなたを %{site_domain_name} の「%{topic_title}」に招待しました"
     text_body_template: |
       %{inviter_name} があなたをディスカッションに招待しました
@@ -1590,6 +2310,7 @@ ja:
 
       %{invite_link}
   custom_invite_mailer:
+    title: "カスタム招待メーラー"
     subject_template: "%{inviter_name} があなたを %{site_domain_name} の「%{topic_title}」に招待しました"
     text_body_template: |
       %{inviter_name} があなたをディスカッションに招待しました
@@ -1610,6 +2331,7 @@ ja:
 
       %{invite_link}
   invite_forum_mailer:
+    title: "フォーラム招待メーラー"
     subject_template: "%{inviter_name} があなたを %{site_domain_name} に招待しました"
     text_body_template: |
       %{inviter_name} があなたを招待しました
@@ -1622,6 +2344,7 @@ ja:
 
       %{invite_link}
   custom_invite_forum_mailer:
+    title: "カスタムフォーラム招待メーラー"
     subject_template: "%{inviter_name} があなたを %{site_domain_name} に招待しました"
     text_body_template: |
       %{inviter_name} があなたを招待しました
@@ -1638,10 +2361,80 @@ ja:
 
       %{invite_link}
   invite_password_instructions:
+    title: "招待のパスワードに関する指示"
     subject_template: "%{site_name} アカウントのパスワード設定"
     text_body_template: "%{site_name} への招待を承諾いただきありがとうございます。ようこそ！\n\nリンクをクリックしてパスワードを設定してください: \n%{base_url}/u/password-reset/%{email_token}\n\n(リンクの有効期限が切れている場合は、メールアドレスでログインする時に「パスワードを忘れました」を選択してください。)\n"
+  download_backup_mailer:
+    title: "バックアップダウンロードのメーラー"
+    subject_template: "[%{email_prefix}] サイトバックアップのダウンロード"
+    text_body_template: |
+      こちらが、あなたがリクエストした[サイトバックアップのダウンロード](%{backup_file_path})です。
+
+      セキュリティ上の理由により、このダウンロードリンクをあなたの有効なメールアドレスに送信しました。
+
+      (このダウンロードを*リクエストしなかった*場合は、これを深刻にみなす必要があります。誰かがあなたのサイトへの管理者アクセスを有しているということです。)
+    no_token: |
+      このバックアップのダウンロードリンクはすでに使用されたか、期限切れとなっています。
+  admin_confirmation_mailer:
+    title: "管理者の確認"
+    subject_template: "[%{email_prefix}] 新しい管理者アカウントを確認してください"
+    text_body_template: |
+      **%{target_username} (%{target_email})**をあなたのフォーラムの管理者として追加することを確認してください。
+
+      [管理者アカウントの確認](%{admin_confirm_url})
+  test_mailer:
+    title: "テストメーラー"
+    subject_template: "[%{email_prefix}] メール配信可能性テスト"
+    text_body_template: |
+      これは次から送信されたテストメールです。
+
+      [**%{base_url}**][0]
+
+      メールの配信可能性は複雑な課題です。最初に確認すべき重要な事項を以下に示します。
+
+      - `notification email` の from: アドレスがサイト設定で正しく設定されていることを*確認してください*。**送信するメールの "from" アドレスに指定されたドメインがメールの検証対象のドメインです**。
+
+      - メールクライアントでメールの生のソースを表示する方法を確認してください。メールのヘッダーを調査すると、重要な手がかりを得ることができます。Gmail では、各メールの右上にあるドロップダウンメニューに含まれる "メッセージのソースを表示" オプションを使用できます。
+
+      - **重要:** あなたの ISP には、メールの送信元のドメイン名と IP アドレスを関連付ける逆引き DNS レコードが入力されていますか？こちらで[逆引き PTR レコードをテストしてください][2]。あなたの ISP が適切な逆引き DNS ポインターレコードを登録しない場合、メールが配信される可能性はほぼありません。
+
+      - あなたのドメインの [SPF レコード][8]は正しいですか？こちらで [SPF レコードをテストしてください][1]。TXT は SPF の正しい正式なレコードタイプであることに注意してください。
+
+      - ドメインの [DKIM レコード][3]は正しいですか？これによりメールの配信可能性が大幅に改善されます。こちらで [DKIM レコードをテストしてください][7]。
+
+      - 独自のメールサーバーを実行している場合は、メールサーバーの IP が[どのメールのブロックリストにも追加されていない][4]ことを確認してください。また、HELO メッセージで DNS に解決する完全修飾ホスト名を確実に送信していることを確認してください。送信していない場合は、多数のメールサーバーによってメールが拒否されることになります。
+
+      - **テストメールを [mail-tester.com][mt] に送信**して、上記すべてが正しく機能していることを確認することを強くお勧めします。
+
+      ([SendGrid][sg]、[SparkPost][sp]、[Mailgun][mg]、または [Mailjet][mj] でアカウントを作成するのが*簡単*な方法です。これらは安価なメールプランを提供しており、小規模のコミュニティに最適です。ただし、DNS に SPF と DKIM レコードをセットアップする必要はあります！)
+
+      このメールの配信可能性テストがあなたのところに届きますように！
+
+      それでは幸運を。
+
+      [Discourse](https://www.discourse.org) 一同より
+
+      [0]: %{base_url}
+      [1]: https://www.kitterman.com/spf/validate.html
+      [2]: https://mxtoolbox.com/ReverseLookup.aspx
+      [3]: http://www.dkim.org/
+      [4]: https://whatismyipaddress.com/blacklist-check
+      [7]: https://www.mail-tester.com/spf-dkim-check
+      [8]: http://www.openspf.org/SPF_Record_Syntax
+      [sg]: https://goo.gl/r1WMF6
+      [sp]: https://www.sparkpost.com/
+      [mg]: https://www.mailgun.com/
+      [mj]: https://www.mailjet.com/pricing/
+      [mt]: https://www.mail-tester.com/
+  new_version_mailer:
+    title: "新しいバージョンメーラー"
+    subject_template: "[%{email_prefix}] 新しい Discourse バージョン、更新が利用可能になりました"
+  new_version_mailer_with_notes:
+    title: "注意付きの新しいバージョンメーラー"
+    subject_template: "[%{email_prefix}] 更新が利用可能になりました"
   flag_reasons:
     off_topic: "あなたの投稿は「話題に関係ない」として通報されました。コミュニティはあなたの投稿がタイトルと最初の投稿で定義されているトピックにふさわしくないと判断しました。"
+    inappropriate: "あなたの投稿は**不適切**として通報されました。コミュニティは投稿が攻撃的、虐待的、または[コミュニティガイドライン](%{base_path}/guidelines)に違反すると感じています。"
     spam: "あなたの投稿は「迷惑」として通報されました。コミュニティはあなたの投稿に営利目的、宣伝目的の性質があり、トピックに意図される有用性または関連性がないと判断しました。"
     notify_moderators: "あなたの投稿は「モデレーターの注意要」として通報されました。コミュニティはあなたの投稿にスタッフメンバーによる手動介入が必要であると判断しました。"
   flags_dispositions:
@@ -1650,17 +2443,93 @@ ja:
     disagreed: "ご連絡いただきありがとうございます。現在調査しています。"
     ignored: "ご連絡いただきありがとうございます。現在調査しています。"
     ignored_and_deleted: "ご連絡いただきありがとうございます。投稿を削除しました。"
+  temporarily_closed_due_to_flags:
+    other: "このトピックは、大量のコミュニティ通報が寄せられたため、一時的に %{count} 時間以上クローズされています。"
   system_messages:
     private_topic_title: "トピック #%{id}"
     contents_hidden: "コンテンツを見るには投稿にアクセスしてください。"
     post_hidden:
       title: "非表示の投稿"
       subject_template: "コミュニティ通報によって非表示にされた投稿"
+      text_body_template: |
+        こんにちは。
+
+        これは %{site_name} からの自動メッセージです。あなたの投稿が非表示になっていることをお知らせします。
+
+        <%{base_url}%{url}>
+
+        %{flag_reason}
+
+        この投稿は、コミュニティからの通報により非表示にされました。そのため、コミュニティからのフィードバックを反映するようにあなたの投稿を書き直すことを検討してください。**%{edit_delay} 分後に編集を開始できます。編集が終わると、自動的に非表示状態が解除されます。**
+
+        ただし、投稿が再びコミュニティによって非表示にされると、スタッフが処理するまで非表示のママとなります。
+
+        その他のガイダンスについては、[コミュニティガイドライン](%{base_url}/guidelines)をご覧ください。
     post_hidden_again:
       title: "再度非表示"
       subject_template: "コミュニティ通報によって非表示にされた投稿、スタッフ通知済み"
+      text_body_template: |
+        こんにちは。
+
+        これは %{site_name} からの自動メッセージです。あなたの投稿が再び非表示になったことをお知らせします。
+
+        <%{base_url}%{url}>
+
+        %{flag_reason}
+
+        コミュニティがこの投稿を通報したため、非表示になっています。**この投稿は 2 回以上非表示となったため、スタッフメンバーが処理するまで非表示のままとなります。**
+
+        その他のガイダンスについては、[コミュニティガイドライン](%{base_url}/guidelines)をご覧ください。
     queued_by_staff:
       title: "承認待ちの投稿"
+      subject_template: "スタッフが投稿を非表示にしました。承認待ち"
+      text_body_template: |
+        こんにちは。
+
+        これは %{site_name} からの自動メッセージです。あなたの投稿が非表示になったことをお知らせします。
+
+        <%{base_url}%{url}>
+
+        あなたの投稿は、スタッフがレビューするまで非表示のままとなります。
+
+        その他のガイダンスについては、[コミュニティガイドライン](%{base_url}/guidelines)をご覧ください。
+    flags_disagreed:
+      title: "通報された投稿をスタッフが復元しました"
+      subject_template: "通報された投稿をスタッフが復元しました"
+      text_body_template: |
+        こんにちは。
+
+        これは %{site_name} からの自動メッセージです。[あなたの投稿](%{base_url}%{url})が復元されたことをお知らせします。
+
+        この投稿はコミュニティによって通報され、スタッフメンバーがそれを復元することを選択しました。
+
+        [details="クリックして復元された投稿を展開"]
+        ``` markdown
+        %{flagged_post_raw_content}
+        ```
+        [/details]
+    flags_agreed_and_post_deleted:
+      title: "通報された投稿をスタッフが削除しました"
+      subject_template: "通報された投稿をスタッフが削除しました"
+      text_body_template: |
+        こんにちは。
+
+        これは、%{site_name} からの自動メッセージです。[あなたの投稿](%{base_url}%{url})が削除されたことをお知らせします。
+
+        %{flag_reason}
+
+        この投稿はコミュニティによって通報され、スタッフメンバーが削除することを選択しました。
+
+        ``` markdown
+        %{flagged_post_raw_content}
+        ```
+
+        詳細については、[コミュニティガイドライン](%{base_url}/guidelines)をご覧ください。
+    usage_tips:
+      text_body_template: |
+        新規ユーザーとして開始するための簡単なヒントについては、[こちらのブログ記事をご覧ください](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/)。
+
+        ここで参加すると、あなたのことを知れるようになり、新規ユーザーの制限が一時的に解除されます。時間が経つにつれ、共にコミュニティを管理するための特別な機能が含まれた[信頼レベル](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)を獲得できるようになります。
     welcome_user:
       title: "ようこそ"
       subject_template: "%{site_name} へようこそ！"
@@ -1672,70 +2541,222 @@ ja:
         コミュニティでは常に礼節ある行動 (%{base_url}/guidelines) を取ってもらえると信じています。
 
         ではお楽しみください！
+    welcome_tl1_user:
+      title: "ようこそ、TL1 ユーザー"
+      subject_template: "一緒に時間を過ごしてくれてありがとうございます"
+      text_body_template: |
+        こんにちは。最近読みふけっているようですね。素晴らしいことです。そこで、あなたの[信頼レベル](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)を昇格しました！
+
+        あなたがここで時間を費やしていることを本当に嬉しく思っており、もっとあなたのことを知りたいと思っています。少しお時間をいただいて、[プロフィールを入力](%{base_url}/my/preferences/profile)していただくか、お気軽に[新しいトピックを開始](%{base_url}/categories)してください。
+    welcome_staff:
+      title: "ようこそ - スタッフ"
+      subject_template: "おめでとうございます。あなたに %{role} ステータスが付与されました！"
+      text_body_template: |
+        スタッフメンバーより、あなたに%{role}ステータスが付与されました。
+
+        %{role}として、<a href='%{base_url}/admin' target='_blank'>管理者インターフェース</a>にアクセスできるようになりました。
+
+        偉大な力には大きな責任が伴います。介入に新しい方は、[介入ガイド](https://meta.discourse.org/t/discourse-moderation-guide/63116)をご覧ください。
     welcome_invite:
+      title: "ようこそ - 招待"
       subject_template: "%{site_name} へようこそ！"
+      text_body_template: |
+        %{site_name} への招待を承諾していただき、ありがとうございます -- ようこそ！
+
+        ‐ この新しいアカウント **%{username}** をあなたのために作成しました。[ユーザープロフィール][prefs]にアクセスして、名前またはパスワードを変更してください。
+
+        ‐ ログインする際は、**元の招待状と同じメールアドレスを使用**してください。異なるものを使用すると、あなたであることがわかりません！
+
+        %{new_user_tips}
+
+        コミュニティでは常に[礼節ある行動](%{base_url}/guidelines) を取ってもらえると信じています。
+
+        ではお楽しみください！
+
+        [prefs]: %{user_preferences_url}
+    tl2_promotion_message:
+      subject_template: "信頼レベルの昇格おめでとうございます！"
+      text_body_template: |
+        あなたの[信頼レベル](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)をもう 1 つ昇格しました！
+
+        経験豊富なユーザーとして、[便利なヒントとコツ](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/)が役に立つことと思います。
+
+        ぜひ参加し続けてください。あなたの投稿を楽しみにしています。
     backup_succeeded:
+      title: "バックアップに成功しました"
       subject_template: "バックアップは正常に完了しました"
+      text_body_template: |
+        バックアップに成功しました。
+
+        [管理者 > バックアップセクション](%{base_url}/admin/backups)にアクセスして、新しいバックアップをダウンロードしてください。
+
+        こちらはログです。
+
+        ``` text
+        %{logs}
+        ```
     backup_failed:
+      title: "バックアップに失敗しました"
       subject_template: "バックアップに失敗しました"
+      text_body_template: |
+        バックアップに失敗しました。
+
+        こちらがログです。
+
+        ``` text
+        %{logs}
+        ```
     restore_succeeded:
+      title: "復元に成功しました"
       subject_template: "復元は正常に完了しました"
+      text_body_template: |
+        復元に成功しました。
+
+        こちらがログです。
+
+        ``` text
+        %{logs}
+        ```
     restore_failed:
+      title: "復元に失敗しました"
       subject_template: "復元に失敗しました"
+      text_body_template: |
+        復元に失敗しました。
+
+        こちらがログです。
+
+        ``` text
+        %{logs}
+        ```
     bulk_invite_succeeded:
+      title: "一括招待に成功しました"
       subject_template: "ユーザーの一括招待に成功しました"
       text_body_template: "ユーザーの一括招待ファイルが処理され、%{sent} 件の招待状が送信されました。"
     bulk_invite_failed:
+      title: "一括招待に失敗しました"
       subject_template: "ユーザーの一括招待中にエラーが発生しました"
+      text_body_template: |
+        あなたの一括ユーザー招待ファイルは処理されました。招待状を %{sent} 通メール送信し、%{failed} 個のエラーが発生しました。
+
+        こちらがログです。
+
+        ``` text
+        %{logs}
+        ```
+    user_added_to_group_as_owner:
+      title: "オーナーとしてグループに追加しました"
+      subject_template: "%{group_name} グループのオーナーとして追加されました"
+      text_body_template: |
+        [%{group_name}](%{base_url}%{group_path})グループのオーナーとして追加されました。
+    user_added_to_group_as_member:
+      title: "メンバーとしてグループに追加しました"
+      subject_template: "%{group_name} グループのメンバーとして追加されました"
+      text_body_template: |
+        [%{group_name}](%{base_url}%{group_path})グループのメンバーとして追加されました。
+    csv_export_succeeded:
+      title: "CSV エクスポートに成功しました"
+      subject_template: "[%{export_title}] データのエクスポートが完了しました"
+      text_body_template: |
+        あなたのデータエクスポートは成功しました！:dvd:
+
+        %{download_link}
+
+        上記のリンクは 48 時間有効です。
+
+        データは zip アーカイブとして圧縮されています。アーカイブを開いたときに自己解凍されない場合は、こちらに推奨されるツールを使用してください: https://www.7-zip.org/
     csv_export_failed:
+      title: "CSV エクスポートに失敗しました"
       subject_template: "データのエクスポートに失敗しました"
       text_body_template: "データのエクスポートに失敗しました。ログを確認するか、[スタッフメンバーにお問い合わせ](%{base_url}/about)ください。"
     email_reject_insufficient_trust_level:
+      title: "メールの拒否 - 信頼レベルが不十分です"
+      subject_template: "[%{email_prefix}] メールの問題 -- 信頼レベルが不十分です"
       text_body_template: |
         %{destination} へのメールメッセージ (件名: 「%{former_title}」) は送信されませんでした。
 
         あなたのアカウントに、このメールアドレスに新しいトピックを投稿するための必要な信頼レベルがありません。これがエラーと思われる場合は、[スタッフメンバーにお問い合わせ](%{base_url}/about)ください。
     email_reject_user_not_found:
+      title: "メールの拒否 - ユーザーが見つかりません"
+      subject_template: "[%{email_prefix}] メールの問題 -- ユーザーが見つかりません"
       text_body_template: |
         %{destination} へのメールメッセージ (件名:「%{former_title}」) は送信されませんでした。
 
         あなたの返信は不明なメールアドレスから送信されています。別のメールアドレスから送信するか、[スタッフメンバーにお問い合わせ](%{base_url}/about)ください。
     email_reject_screened_email:
+      title: "メールの拒否 - スクリーン対象メール"
+      subject_template: "[%{email_prefix}] メールの問題 -- メールがブロックされています"
       text_body_template: |
         %{destination} へのメールメッセージ (件名:「%{former_title}」) は送信されませんでした。
 
         あなたの返信はブロックされているメールアドレスから送信されています。別のメールアドレスから送信するか、[スタッフメンバーにお問い合わせ](%{base_url}/about)ください。
     email_reject_not_allowed_email:
+      title: "メールの拒否 - 許可されていないメール"
+      subject_template: "[%{email_prefix}] メールの問題 -- メールがブロックされています"
       text_body_template: |
         %{destination} へのメールメッセージ (件名:「%{former_title}」) は送信されませんでした。
 
         あなたの返信はブロックされているメールアドレスから送信されています。別のメールアドレスから送信するか、[スタッフメンバーにお問い合わせ](%{base_url}/about)ください。
+    email_reject_inactive_user:
+      title: "メールの拒否 - 非アクティブユーザー"
+      subject_template: "[%{email_prefix}] メールの問題 -- 非アクティブユーザー"
+      text_body_template: |
+        %{destination} へのメールメッセージ (件名:「%{former_title}」) は送信されませんでした。
+
+        このメールアドレスに関連付けれらているあなたのアカウントは有効ではありません。アカウントを有効化してからメールを送信してください。
+    email_reject_silenced_user:
+      title: "メールの拒否 - 投稿禁止ユーザー"
+      subject_template: "[%{email_prefix}] メールの問題 -- 投稿禁止ユーザー"
+      text_body_template: |
+        %{destination} へのメールメッセージ (件名:「%{former_title}」) は送信されませんでした。
+
+        このメールアドレスに関連付けれらているあなたのアカウントは投稿禁止になっています。
     email_reject_reply_user_not_matching:
+      title: "メールの拒否 - ユーザーが一致しません"
+      subject_template: "[%{email_prefix}] メールの問題 -- 予期しない返信アドレス"
       text_body_template: |
         %{destination} へのメールメッセージ (件名:「%{former_title}」) は送信されませんでした。
 
         あなたの返信は期待されたのとは異なるメールアドレスから送信されているため、これが同一人物であるかを確認できません。別のメールアドレスから送信するか、[スタッフメンバーにお問い合わせ](%{base_url}/about)ください。
+    email_reject_empty:
+      title: "メールの拒否 - 空です"
+      subject_template: "[%{email_prefix}] メールの問題 -- コンテンツがありません"
+      text_body_template: |
+        %{destination} へのメールメッセージ (件名:「%{former_title}」) は送信されませんでした。
+
+        返信のコンテンツがあなたのメールに見つかりませんでした。
+
+        これを受信し、_実際に_返信を含めていた場合は、より単純なフォーマットでもう一度お試しください。
     email_reject_parsing:
+      title: "メールの拒否 - 解析"
+      subject_template: "[%{email_prefix}] メールの問題 -- コンテンツが認識されません"
       text_body_template: |
         %{destination} へのメールメッセージ (件名: %{former_title}) は処理されませんでした。
 
         メールに返信が見つかりませんでした。**メールのトップに返信が入力されていることを確認してください** インライン返信は処理できません。
     email_reject_invalid_access:
+      title: "メールの拒否 - 無効なアクセス"
+      subject_template: "[%{email_prefix}] メールの問題 -- 無効なアクセス"
       text_body_template: |
         %{destination} へのメールメッセージ (件名: 「%{former_title}」) は送信されませんでした。
 
         あなたのアカウントに、このカテゴリに新しいトピックを投稿するための権限がありません。これがエラーと思われる場合は、[スタッフメンバーにお問い合わせ](%{base_url}/about)ください。
     email_reject_strangers_not_allowed:
+      title: "メールの拒否 - 未確認者は許可されていません"
+      subject_template: "[%{email_prefix}] メールの問題 -- 無効なアクセス"
       text_body_template: |
         %{destination} へのメールメッセージ (件名: 「%{former_title}」) は送信されませんでした。
 
         このメールの送信先のカテゴリでは、有効なアカウントと既知のメールアドレスを持つユーザーしか返信できません。これがエラーと思われる場合は、[スタッフメンバーにお問い合わせ](%{base_url}/about)ください。
     email_reject_invalid_post:
+      title: "メールの拒否 - 無効な投稿"
+      subject_template: "[%{email_prefix}] メールの問題 -- 投稿エラー"
       text_body_template: |
         %{destination} へのメールメッセージ (件名: %{former_title}) は処理されませんでした。
 
         複雑な書式、メッセージのサイズなどの原因が考えられます。もう一度お試しください。このエラーが続くようであれば、ウェブサイトから投稿してください。
     email_reject_invalid_post_specified:
+      title: "メールの拒否 - 無効な投稿が指定されました"
+      subject_template: "[%{email_prefix}] メールの問題 -- 投稿エラー"
       text_body_template: |
         %{destination} へのメールメッセージ (件名: %{former_title}) は処理されませんでした。
 
@@ -1744,12 +2765,31 @@ ja:
         %{post_error}
 
         問題を修正できるようであれば、もう一度お試しください。
+      date_invalid: "投稿の作成日が見つかりません。メールに Date: ヘッダーが欠けているようです。"
+    email_reject_post_too_short:
+      title: "メールの拒否 - 投稿が短すぎます"
+      subject_template: "[%{email_prefix}] メールの問題 -- 投稿が短すぎます"
+      text_body_template: |
+        %{destination} へのメールメッセージ (件名:「%{former_title}」) は送信されませんでした。
+
+        より詳細な会話を促進するため、非常に短い返信は許可されていません。%{count} 文字以上で返信してください。または、"+1" と返信すれば、メールを介して投稿に「いいね！」することができます。
+    email_reject_invalid_post_action:
+      title: "メールの拒否 - 無効な投稿アクション"
+      subject_template: "[%{email_prefix}] メールの問題 -- 無効な投稿アクション"
+      text_body_template: |
+        %{destination} へのメールメッセージ (件名:「%{former_title}」) は送信されませんでした。
+
+        投稿アクションが認識されませんでした。もう一度お試しいただくか、これが続く場合はウェブサイトから投稿してください。
     email_reject_reply_key:
+      title: "メールの拒否 - 返信キー"
+      subject_template: "[%{email_prefix}] メールの問題 -- 不明な返信キー"
       text_body_template: |
         %{destination} へのメールメッセージ (件名:「%{former_title}」) は送信されませんでした。
 
         メールの返信キーが無効であるか不明であるため、このメールの返信先を確認できません。[スタッフメンバーにお問い合わせ](%{base_url}/about)ください。
     email_reject_bad_destination_address:
+      title: "メールの拒否 - 不正な宛先アドレス"
+      subject_template: "[%{email_prefix}] メールの問題 -- 不明な To: アドレス"
       text_body_template: |
         %{destination} へのメールメッセージ (件名:「%{former_title}」) は送信されませんでした。
 
@@ -1762,27 +2802,44 @@ ja:
           - メールアドレスの Message-ID ヘッダーが変更されていませんか？Message-ID は同一であり、変更されてはいけません。
 
         もっとヘルプが必要ですか？%{base_url}/about の連絡先情報からお問い合わせください。
+    email_reject_old_destination:
+      title: "メールの拒否 - 古い宛先"
+      subject_template: "[%{email_prefix}] メールの問題 -- 古い通知に返信しようとしています"
+      text_body_template: |
+        %{destination} へのメールメッセージ (件名:「%{former_title}」) は送信されませんでした。
+
+        元の通知への返信は %{number_of_days} 日間のみ受け付けています。会話を続けるには、[トピックにアクセス](%{short_url})してください。
     email_reject_topic_not_found:
+      title: "メールの拒否 - トピックが見つかりません"
+      subject_template: "[%{email_prefix}] メールの問題 -- トピックが見つかりません"
       text_body_template: |
         %{destination} へのメールメッセージ (件名: 「%{former_title}」) は送信されませんでした。
 
         返信しようとしているトピックはなくなりました。削除された可能性があります。これがエラーと思われる場合は、[スタッフメンバーにお問い合わせ](%{base_url}/about)ください。
     email_reject_topic_closed:
+      title: "メールの拒否 - トピックがクローズされています"
+      subject_template: "[%{email_prefix}] メールの問題 -- トピックがクローズされています"
       text_body_template: |
         %{destination} へのメールメッセージ (件名: 「%{former_title}」) は送信されませんでした。
 
         返信しようとしているトピックは現在クローズされており、返信を受け付けていません。これがエラーと思われる場合は、[スタッフメンバーにお問い合わせ](%{base_url}/about)ください。
     email_reject_auto_generated:
+      title: "メールの拒否 - 自動生成"
+      subject_template: "[%{email_prefix}] メールの問題 -- 自動生成の返信"
       text_body_template: |
         %{destination} へのメールメッセージ (件名: 「%{former_title}」) は送信されませんでした。
 
         あなたのメールは「自動生成」とマークされており、人が入力する代わりにコンピューターが自動で作成したメールです。これがエラーと思われる場合は、[スタッフメンバーにお問い合わせ](%{base_url}/about)ください。
     email_reject_unrecognized_error:
+      title: "メールの拒否 - 認識されないエラー"
+      subject_template: "[%{email_prefix}] メールの問題 -- 認識されないエラー"
       text_body_template: |
         %{destination} へのメールメッセージ (件名: 「%{former_title}」) は送信されませんでした。
 
         あなたのメールを処理中に不明なエラーが発生したため、投稿されませんでした。もう一度試すか、[スタッフメンバーにお問い合わせ](%{base_url}/about)ください。
     email_reject_attachment:
+      title: "メールの添付ファイルは拒否されました"
+      subject_template: "[%{email_prefix}] メールの問題 -- 添付ファイルは拒否されました"
       text_body_template: |
         残念ながら、%{destination} へのメールメッセージ (件名:「%{former_title}」) に含まれる添付ファイルは拒否されました。
 
@@ -1791,30 +2848,158 @@ ja:
 
         これがエラーだと思われる場合は、[スタッフメンバーにお問い合わせ](%{base_url}/about)ください。
     email_reject_reply_not_allowed:
+      title: "メールの拒否 - 返信は許可されていません"
+      subject_template: "[%{email_prefix}] メールの問題 -- 返信は許可されていません"
       text_body_template: |
         %{destination} へのメールメッセージ (件名: 「%{former_title}」) は送信されませんでした。
 
         トピックに返信する権限がありません。これがエラーと思われる場合は、[スタッフメンバーにお問い合わせ](%{base_url}/about)ください。
     email_reject_reply_to_digest:
+      title: "メールの拒否 - 要約への返信"
+      subject_template: "[%{email_prefix}] メールの問題 -- 要約への返信"
       text_body_template: |
         %{destination} へのメールメッセージ (件名: 「%{former_title}」) は送信されませんでした。
 
         要約メールに返信したため、受領されていません。
 
         これがエラーと思われる場合は、[スタッフメンバーにお問い合わせ](%{base_url}/about)ください。
+    email_error_notification:
+      title: "メールエラー通知"
+      subject_template: "[%{email_prefix}] メールの問題 -- POP 認証エラー"
+      text_body_template: |
+        残念ながら、POP サーバーからのメールのポーリング中に認証エラーが発生しました。
+
+        [サイト設定](%{base_url}/admin/site_settings/category/email) で POP の資格情報が正しく構成されていることを確認してください。
+
+        POP メールアカウントのウェブ UI がある場合は、ウェブにログインしてから、そこで設定を確認する必要がある場合があります。
     email_revoked:
+      title: "メールが取り消されました"
+      subject_template: "メールアドレスは正しいですか？"
       text_body_template: |
         あなたにメールでご連絡できません。あなたへの最後の数通のメールは配達不能としてすべて返送されました。
 
         [あなたのメールアドレス](%{base_url}/my/preferences/email)が有効であり機能していることを確認してください。また、配達が可能になるように、あなたのアドレス帳/連絡先リストにこのメールアドレスを追加してください。
+    email_bounced: |
+      %{email} へのメッセージは返送されました。
+
+      ### 詳細
+
+      ``` text
+      %{raw}
+      ```
+    ignored_users_summary:
+      title: "無視されたユーザーがしきい値を超えました"
+      subject_template: "ユーザーは多数のユーザーから無視されています"
+      text_body_template: |
+        こんにちは。
+
+        これは、%{site_name} からの自動メッセージです。@%{username} が %{ignores_threshold} 人のユーザーから無視されていることをお知らせします。これは、コミュニティに問題が発生している可能性があることを示します。
+
+        このユーザーからの[最近の投稿をレビュー](%{base_url}/u/%{username}/summary)し、場合によっては[無視およびミュートされたユーザーのレポート](%{base_url}/admin/reports/top_ignored_users)のほかのユーザーについてもレビューすることをお勧めします。
+
+        その他のガイダンスについては、[コミュニティガイドライン](%{base_url}/guidelines)をご覧ください。
+    too_many_spam_flags:
+      title: "迷惑通報が多すぎます"
+      subject_template: "新規アカウントは保留中です"
+      text_body_template: |
+        こんにちは。
+
+        これは、%{site_name} からの自動メッセージです。あなたの投稿はコミュニティから通報されたため、一時的に非表示になっていることをお知らせします。
+
+        予防措置としてあなたの新しいアカウントは投稿禁止となっているため、スタッフメンバーがあなたのアカウントをレビューするまで返信またはトピックを作成することはできません。ご不便をおかけして申し訳ありません。
+
+        その他のガイダンスについては、[コミュニティガイドライン](%{base_url}/guidelines)をご覧ください。
+    too_many_tl3_flags:
+      title: "TL3 通報が多すぎます"
+      subject_template: "新規アカウントは保留中です"
+      text_body_template: |
+        こんにちは。
+
+        これは、%{site_name} からの自動メッセージです。あなたのアカウントとは、コミュニティ通報が多数あるため保留中になっていることをお知らせします。
+
+        予防措置としてあなたの新しいアカウントは投稿禁止となっているため、スタッフメンバーがあなたのアカウントをレビューするまで新しい返信またはトピックを作成することはできません。ご不便をおかけして申し訳ありません。
+
+        その他のガイダンスについては、[コミュニティガイドライン](%{base_url}/guidelines)をご覧ください。
+    silenced_by_staff:
+      title: "スタッフにより投稿禁止にされました"
+      subject_template: "アカウントは一時的に保留中です"
+      text_body_template: |
+        こんにちは。
+
+        これは、%{site_name} からの自動メッセージです。あなたのアカウントは、予防措置として一時的に保留中となっていることをお知らせします。
+
+        引き続き閲覧できますが、[スタッフメンバー](%{base_url}/about)があなたの直近の投稿をレビューするまで返信またはトピックを作成することはできません。ご不便をおかけして申し訳ありません。
+
+        その他のガイダンスについては、[コミュニティガイドライン](%{base_url}/guidelines)をご覧ください。
+    user_automatically_silenced:
+      title: "ユーザーは自動的に投稿禁止にされました"
+      subject_template: "新規ユーザー %{username} はコミュニティ通報により投稿禁止になりました"
+      text_body_template: |
+        これは自動メッセージです。
+
+        新規ユーザー [%{username}](%{user_url}) は、複数のユーザーが %{username} の投稿を通報したため自動的に投稿禁止になりました。
+
+        [通報をレビュー](%{base_url}/admin/flags)してください。%{username} が誤って投稿禁止になっている場合は、[このユーザーの管理者ページ](%{user_url})にある投稿禁止解除ボタンをクリックしてください。
+
+        このしきい値は、`silence_new_user` サイト設定から変更できます。
     spam_post_blocked:
+      title: "迷惑投稿はブロックされました"
       subject_template: "同一リンクの連続投稿により、新規ユーザー %{username} の投稿をブロック"
+      text_body_template: |
+        これは自動メッセージです。
+
+        新規ユーザー [%{username}](%{user_url}) は、%{domains} へのリンクが含まれる複数の投稿を作成しようとしましたが、迷惑投稿を避けるため、これらの投稿はブロックされました。このユーザーは引き続き、%{domains} にリンクしていない新しい投稿を作成できます。
+
+        [このユーザーをレビュー](%{user_url})してください。
+
+        これは、`newuser_spam_host_threshold` および `allowed_spam_host_domains` サイト設定から変更できます。例外である場合は、ホワイトリストに %{domains} を追加することを検討してください。
+    unsilenced:
+      title: "投稿禁止が解除されました"
+      subject_template: "アカウントは保留状態でなくなりました"
+      text_body_template: |
+        こんにちは。
+
+        これは、%{site_name} からの自動メッセージです。あなたのアカウントはスタッフがレビューし、保留状態でなくなりました。
+
+        新しい返信とトピックの作成を再開できます。ご協力ありがとうございました。
     pending_users_reminder:
+      title: "保留中のユーザーに関するリマインダー"
       subject_template:
         other: "承認待ちのユーザーが %{count} 人います"
+      text_body_template: |
+        新規ユーザー登録は承認 (または拒否) 待ちであり、このフォーラムにアクセスできません。
+
+        [これらの登録をレビュー](%{base_url}/review)してください。
     download_remote_images_disabled:
+      title: "リモート画像のダウンロードは無効化されています"
       subject_template: "リモート画像のダウンロードは無効化されました"
       text_body_template: "`download_remote_images_threshold` のディスク空き容量制限に達したため、`download_remote_images_to_local` 設定は無効になりました。"
+    dashboard_problems:
+      title: "ダッシュボードの問題"
+      subject_template: "サイトダッシュボードに関する新しいアドバイス"
+      text_body_template: |
+        あなたの現在のサイト設定に基づき、新しいアドバイスと推奨事項がいくつかあります。
+
+        [サイトダッシュボードにアクセス](%{base_url}/admin)して、それらをご覧ください。
+
+        ダッシュボードに何も表示されない場合は、別のスタッフメンバーがすでにこのアドバイスに対応した可能性があります。スタッフアクションのリストは[スタッフアクションログ](%{base_url}/admin/logs/staff_action_logs)をご覧ください。
+    new_user_of_the_month:
+      title: "あなたは今月の新規ユーザーです！"
+      subject_template: "あなたは今月の新規ユーザーです！"
+      text_body_template: |
+        おめでとうございます。**%{month_year}の「今月の新規ユーザー」アワード**を獲得しました。:trophy:
+
+        このアワードは毎月 2 つの新規ユーザーのみに与えられるもので、[バッジページ](%{url})に永久的に表示されるようになります。
+
+        あなたは、あっという間にコミュニティの貴重なメンバーとなりました。参加していただきありがとうございます。これからも素晴らしい貢献を楽しみにしています！
+    queued_posts_reminder:
+      title: "キューに入れられた投稿に関するリマインダー"
+      subject_template:
+        other: "%{count} 件の投稿がレビュー待ちです"
+      text_body_template: |
+        こんにちは。
+
+        新規ユーザーの投稿が介入を必要としており、現在レビュー待ちとなっています。[こちらから承認または拒否](%{base_url}/review?type=ReviewableQueuedPost)してください。
   unsubscribe_link: |
     メールの購読を解除するには、[こちらをクリック](%{unsubscribe_url})してください。
   unsubscribe_link_and_mail: |
@@ -1825,15 +3010,235 @@ ja:
     メールの購読を解除するには、[こちらをクリック](%{unsubscribe_url})してください。
   subject_re: "Re: "
   subject_pm: "[PM] "
+  email_from: "%{site_name} 経由の %{user_name}"
   user_notifications:
     previous_discussion: "以前の返信"
+    reached_limit:
+      other: "注意: 1 日あたり最大 %{count} 通のメールを送信します。サイトをチェックして、抑制されているメールを確認してください。追伸: 人気者でいてくれてありがとう！"
+    in_reply_to: "返信:"
     unsubscribe:
       title: "購読解除"
       description: "メールの購読に興味がありませんか？下のリンクをクリックすると、すぐに購読を解除できます:"
     reply_by_email: "返信するには、[トピックにアクセス](%{base_url}%{url})するか、このメールに返信してください。"
+    reply_by_email_pm: "%{participants} に返答するには、[メッセージにアクセス](%{base_url}%{url})するか、このメールに返信してください。"
+    only_reply_by_email: "返答するにはこのメールに返信してください。"
+    only_reply_by_email_pm: "%{participants} に返答するには、このメールに返信してください。"
     visit_link_to_respond: "返信するには[トピックにアクセス](%{base_url}%{url})してください。"
+    visit_link_to_respond_pm: "%{participants} に返答するには、[メッセージにアクセス](%{base_url}%{url})してください。"
+    reply_above_line: "## このラインより上に返信を入力してください。 ##"
     posted_by: "%{post_date} に %{username} が投稿"
+    pm_participants: "参加者: %{participants}"
+    invited_group_to_private_message_body: |
+      %{username} が @%{group_name} をメッセージに招待しました
+
+      > **[%{topic_title}](%{topic_url})**
+      >
+      > %{topic_excerpt}
+
+      次のサイトにあります。
+
+      > %{site_title} -- %{site_description}
+
+      メッセージに参加するには、以下のリンクをクリックしてください。
+
+      %{topic_url}
+    invited_to_private_message_body: |
+      %{username} があなたをメッセージに招待しました
+
+      > **[%{topic_title}](%{topic_url})**
+      >
+      > %{topic_excerpt}
+
+      次のサイトにあります。
+
+      > %{site_title} -- %{site_description}
+
+      メッセージに参加するには、以下のリンクをクリックしてください。
+
+      %{topic_url}
+    invited_to_topic_body: |
+      %{username} があなたをディスカッションに招待しました
+
+      > **[%{topic_title}](%{topic_url})**
+      >
+      > %{topic_excerpt}
+
+      次のサイトにあります。
+
+      > %{site_title} -- %{site_description}
+
+      ディスカッションに参加するには、以下のリンクをクリックしてください。
+
+      %{topic_url}
+    user_invited_to_private_message_pm_group:
+      title: "ユーザーが PM にグループを招待しました"
+      subject_template: "[%{email_prefix}] %{username} が @%{group_name} をメッセージ '%{topic_title}' に招待しました"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_invited_to_private_message_pm:
+      title: "ユーザーが PM に招待されました"
+      subject_template: "[%{email_prefix}] %{username} があなたをメッセージ '%{topic_title}' に招待しました"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_invited_to_private_message_pm_staged:
+      title: "ユーザーが PM ステージングに招待されました"
+      subject_template: "[%{email_prefix}] %{username} があなたをメッセージ '%{topic_title}' に招待しました"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_invited_to_topic:
+      title: "ユーザーがトピックに招待されました"
+      subject_template: "[%{email_prefix}] %{username} があなたを '%{topic_title}' に招待しました"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_replied:
+      title: "ユーザーが返信しました"
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_replied_pm:
+      title: "ユーザーが PM に返信しました"
+      subject_template: "[%{email_prefix}] [PM] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_quoted:
+      title: "ユーザーが引用しました"
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_linked:
+      title: "ユーザーがリンクしました"
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_mentioned:
+      title: "ユーザーがメンションしました"
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_mentioned_pm:
+      title: "ユーザーが PM をメンションしました"
+      subject_template: "[%{email_prefix}] [PM] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_group_mentioned:
+      title: "ユーザーグループがメンションしました"
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_posted:
+      title: "ユーザーが投稿しました"
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_watching_first_post:
+      title: "ユーザーが最初の投稿をウォッチ中です"
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_posted_pm:
+      title: "ユーザーが PM を投稿しました"
+      subject_template: "[%{email_prefix}] [PM] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_posted_pm_staged:
+      title: "ユーザーがステージングに PM を投稿しました"
+      subject_template: "%{optional_re}%{topic_title}"
+      text_body_template: |2
+
+        %{message}
+    account_suspended:
+      title: "アカウントが凍結されました"
+      subject_template: "[%{email_prefix}] あなたのアカウントは凍結されました"
+      text_body_template: |
+        あなたは %{suspended_till} までフォーラムから凍結されました。
+
+        理由 - %{reason}
+    account_silenced:
+      title: "アカウントが投稿禁止にされました"
+      subject_template: "[%{email_prefix}] あなたのアカウントは投稿禁止にされました"
+      text_body_template: |
+        あなたは %{silenced_till} までフォーラムから投稿禁止にされました。
+
+        理由 - %{reason}
     account_exists:
+      title: "アカウントはすでに存在します"
+      subject_template: "[%{email_prefix}] アカウントはすでに存在します"
       text_body_template: |
         %{site_name} にアカウントを作成しようとしたか、アカウントのメールを %{email} に変更しようとしましたが、%{email} のアカウントはすでに存在します。
 
@@ -1843,6 +3248,8 @@ ja:
 
         ご質問があれば、[気さくなスタッフにお問い合わせ](%{base_url}/about)ください。
     account_second_factor_disabled:
+      title: "二要素認証が無効です"
+      subject_template: "[%{email_prefix}] 二要素認証が無効です"
       text_body_template: |
         %{site_name} のアカウントの二要素認証が無効になったため、パスワードのみでログインできるようになりました。今後、追加の認証コードは不要です。
 
@@ -1854,16 +3261,19 @@ ja:
       since_last_visit: "最終アクセス以降"
       new_topics: "新規トピック"
       unread_notifications: "未読の通知"
+      unread_high_priority: "優先度の高い未読の通知"
       liked_received: "受け取った「いいね！」"
       new_users: "新規ユーザー"
       popular_topics: "人気のトピック"
       follow_topic: "このトピックをフォロー"
       join_the_discussion: "もっと読む"
       popular_posts: "人気の投稿"
+      more_new: "あなたへの新着情報"
       subject_template: "[%{email_prefix}] 要約"
       unsubscribe: "この要約は、しばらくアクセスがなかった場合に %{site_link} から送信されます。%{email_preferences_link} を変更するか、%{unsubscribe_link} で購読を解除できます。"
       your_email_settings: "メール設定"
       click_here: "こちらをクリック"
+      from: "%{site_name}"
       preheader: "%{last_seen_at} の最終アクセス以降の要約"
     forgot_password:
       title: "パスワードを忘れました"
@@ -1887,7 +3297,17 @@ ja:
         %{base_url}/session/email-login/%{email_token}
     set_password:
       title: "パスワードを設定"
+      subject_template: "[%{email_prefix}] パスワードを設定してください"
+      text_body_template: |
+        誰かが [%{site_name}](%{base_url}) のあなたのアカウントにパスワードを追加するよう依頼しました。または、この検証済みのメールアドレスに関連付けられている対応のオンラインサービス (Google、Facebook など) を使用してログインすることもできます。
+
+        これをリクエストしなかった場合は、このメールを無視しても構いません。
+
+        次のリンクをクリックして、パスワードを選択してください。
+        %{base_url}/u/password-reset/%{email_token}
     admin_login:
+      title: "管理者ログイン"
+      subject_template: "[%{email_prefix}] ログイン"
       text_body_template: |
         誰かが [%{site_name}](%{base_url}) のアカウントにログインしようとしています。
 
@@ -1896,7 +3316,13 @@ ja:
         ログインするには次のリンクをクリックしてください:
         %{base_url}/session/email-login/%{email_token}
     account_created:
+      title: "アカウントが作成されました"
       subject_template: "[%{email_prefix}] 新しいアカウント"
+      text_body_template: |
+        あなたの新規アカウントが %{site_name} で作成されました
+
+        次のリンクをクリックして、新しいアカウントのパスワードを選択してください。
+        %{base_url}/u/password-reset/%{email_token}
     confirm_new_email:
       title: "新しいメールを確認してください"
       subject_template: "[%{email_prefix}] 新しいメールアドレスを確認してください"
@@ -1918,9 +3344,24 @@ ja:
     confirm_old_email:
       title: "古いメールを確認してください"
       subject_template: "[%{email_prefix}] 現在のメールアドレスを確認してください"
+      text_body_template: |
+        メールアドレスを変更する前に、あなたが現在のメールアカウントを管理していることを確認する必要があります。このステップを完了したら、当たらhしいメールアドレスを確認してください。
+
+        次のリンクをクリックして、%{site_name} の現在のメールアドレスを確認してください。
+
+        %{base_url}/u/confirm-old-email/%{email_token}
     confirm_old_email_add:
+      title: "古いメールの確認 (追加)"
       subject_template: "[%{email_prefix}] 現在のメールアドレスを確認してください"
+      text_body_template: |
+        新しいメールアドレスを追加する前に、あなたが現在のメールアカウントを管理していることを確認する必要があります。このステップを完了したら、新しいメールアドレスを確認してください。
+
+        次のリンクをクリックして、%{site_name} の現在のメールアドレスを確認してください。
+
+        %{base_url}/u/confirm-old-email/%{email_token}
     notify_old_email:
+      title: "古いメールに通知"
+      subject_template: "[%{email_prefix}] あなたのメールアドレスは変更されました"
       text_body_template: |
         これは、%{site_name} のあなたのメールアドレスが変更されたことを
         知らせる自動メッセージです。誤って変更された場合は、サイト管理者に
@@ -1930,6 +3371,8 @@ ja:
 
         %{new_email}
     notify_old_email_add:
+      title: "古いメールに通知 (追加)"
+      subject_template: "[%{email_prefix}] 新しいメールアドレスが追加されました"
       text_body_template: |
         これは、%{site_name} のメールアドレスが追加されたことを知らせる
         自動メッセージです。誤って追加された場合は、サイト管理者に
@@ -1939,7 +3382,16 @@ ja:
 
         %{new_email}
     signup_after_approval:
+      title: "登録 - 承認後"
       subject_template: "%{site_name} での承認が完了しました！"
+      text_body_template: "%{site_name} へようこそ！\n\nスタッフメンバーが %{site_name} のあなたのアカウントを承認しました。\n\nこれで、次の場所からログインすると、新しいアカウントにアクセスできるようになりました。\n%{base_url}\n\n上記のリンクをクリックできない場合は、それをコピーしてウェブブラウザのアドレスバーに貼り付けてください。\n\n%{new_user_tips}\n\nコミュニティでは常に[礼節ある行動](%{base_url}/guidelines)を取ってもらえると信じています。 \n\nではお楽しみください！\n"
+    signup_after_reject:
+      title: "登録 - 拒否後"
+      subject_template: "%{site_name} での承認が拒否されました"
+      text_body_template: |
+        スタッフメンバーは %{site_name} のあなたのアカウントを拒否しました。
+
+        %{reject_reason}
     signup:
       title: "登録"
       subject_template: "[%{email_prefix}] 新しいアカウントを確認してください"
@@ -1950,8 +3402,43 @@ ja:
         %{base_url}/u/activate-account/%{email_token}
 
         このリンクがクリックできない場合は、リンクをコピーしてウェブブラウザのアドレスバーに貼り付けてください。
+    activation_reminder:
+      title: "アクティベーションに関するリマインダー"
+      subject_template: "[%{email_prefix}] アカウントの確認に関するリマインダー"
+      text_body_template: |
+        %{site_name} へようこそ！
+
+        これはあなたのアカウントのアクティベーションに関するリマインダーです。
+
+        新しいアカウントを確認して有効にするには、次のリンクをクリックしてください:
+        %{base_url}/u/activate-account/%{email_token}
+
+        このリンクがクリックできない場合は、リンクをコピーしてウェブブラウザのアドレスバーに貼り付けてください。
+    suspicious_login:
+      title: "新しいログインのアラート"
+      subject_template: "[%{site_name}] %{location} からの新しいログイン"
+      text_body_template: |
+        こんにちは。
+
+        普段使用されていないデバイスまたは場所からログインがあったようです。これはあなたですか？
+
+         - 場所: %{location} (%{client_ip})
+         - ブラウザ: %{browser}
+         - デバイス: %{device} – %{os}
+
+        これがあなたであったなら良いことです！ほかに何もする必要はありません。
+
+        これがあなたでなかったなら、[既存のセッションをレビュー](%{base_url}/my/preferences/account)し、パスワードを変更することを検討してください。
     post_approved:
       title: "あなたの投稿は承認されました"
+      subject_template: "[%{site_name}] あなたの投稿は承認されました"
+      text_body_template: |
+        こんにちは。
+
+        これは、%{site_name} からの自動メッセージです。[あなたの投稿](%{base_url}%{post_url})が承認されたことをお知らせします。
+  page_forbidden:
+    title: "おっとっと！そのページは非公開です。"
+  site_setting_missing: "`%{name}` サイト設定は、設定されている必要があります。"
   page_not_found:
     title: "おっとっと！ページが存在しないか非公開です。"
     popular_topics: "人気"
@@ -1959,6 +3446,9 @@ ja:
     see_more: "もっと"
     search_title: "このサイトを検索"
     search_button: "検索"
+  offline:
+    title: "アプリを読み込めません"
+    offline_page_message: "オフラインになっているようです！ネットワーク接続を確認して、もう一度お試しください。"
   login_required:
     welcome_message: |
       ## [%{title} へようこそ](#welcome)
@@ -1973,12 +3463,27 @@ ja:
     unauthorized: "アップロードしようとしているファイルは許可されていません (許可されている拡張子: %{authorized_extensions})。"
     pasted_image_filename: "貼り付けた画像"
     store_failure: "ユーザー #%{user_id} のアップロード #%{upload_id} の保存に失敗しました。"
+    file_missing: "アップロードするファイルを指定する必要があります。"
+    empty: "指定されたファイルは空です。"
+    png_to_jpg_conversion_failure_message: "PNG から JPG への変換中にエラーが発生しました。"
+    optimize_failure_message: "アップロードされた画像を最適化中にエラーが発生しました。"
     attachments:
       too_large: "アップロードしようとしているファイルが大きすぎます (最大サイズは %{max_size_kb} KB です)。"
     images:
       too_large: "アップロードしようとしている画像が大きすぎます (最大サイズは %{max_size_kb} KB です)。サイズを変更してもう一度お試しください。"
+      larger_than_x_megapixels: "アップロードしようとしている画像が大きすぎます (最大サイズは %{max_image_megapixels} メガピクセルです)。サイズを変更してもう一度お試しください。"
       size_not_found: "画像のサイズを判定できませんでした。画像が破損している可能性があります。"
+    placeholders:
+      too_large: "(%{max_size_kb}KB を超える画像)"
+  avatar:
+    missing: "そのメールアドレスに関連付けられたアバターが見つかりません。もう一度アップロードしてください。"
+  flag_reason:
+    sockpuppet: "新規ユーザーがトピックを作成し、別の新規ユーザーが同じ IP アドレス (%{ip_address}) で返信しました。<a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a> サイト設定をご覧ください。"
+    spam_hosts: "この新規ユーザーは、同じドメインへのリンクを含む複数の投稿を作成しようとしました。リンクが含まれるこのユーザーからのすべての投稿をレビューする必要があります。<a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> サイト設定をご覧ください。"
   skipped_email_log:
+    exceeded_emails_limit: "max_emails_per_day_per_user を超えました"
+    exceeded_bounces_limit: "bounce_score_threshold を超えました"
+    mailing_list_no_echo_mode: "ユーザー自身の投稿に対するメーリングリスト通知が無効です"
     user_email_no_user: "ID %{user_id} のユーザーが見つかりません"
     user_email_post_not_found: "ID %{post_id} の投稿が見つかりません"
     user_email_anonymous_user: "ユーザーは匿名です"
@@ -1986,9 +3491,12 @@ ja:
     user_email_seen_recently: "最近アクセスしたユーザー"
     user_email_notification_already_read: "このメールに関する通知は既読です"
     user_email_notification_topic_nil: "post.topic は NIL です"
+    user_email_post_user_deleted: "投稿のユーザーは削除されました。"
     user_email_post_deleted: "投稿は作者によって削除されました"
     user_email_user_suspended: "ユーザーは凍結状態です"
     user_email_already_read: "ユーザーはこの投稿を閲覧済みです"
+    user_email_access_denied: "ユーザーはこの投稿を閲覧できません"
+    user_email_no_email: "ユーザー ID %{user_id} に関連付けられたメールはありません"
     sender_message_blank: "メッセージが空です"
     sender_message_to_blank: "message.to が空です"
     sender_text_part_body_blank: "text_part.body が空です"
@@ -1996,9 +3504,32 @@ ja:
     sender_post_deleted: "投稿は削除されています"
     sender_message_to_invalid: "受信者のメールアドレスが無効です"
     sender_topic_deleted: "トピックは削除されています"
+    group_smtp_post_deleted: "投稿は削除されています"
+    group_smtp_topic_deleted: "トピックは削除されています"
+    group_smtp_disabled_for_group: "グループの SMTP は無効になっています"
   color_schemes:
     base_theme_name: "ベース"
+    light: "ライト"
+    dark: "ダーク"
+    neutral: "ニュートラル"
+    grey_amber: "グレーアンバー"
+    shades_of_blue: "青系の色"
+    latte: "ラテ"
+    summer: "夏"
+    dark_rose: "ダークローズ"
+    wcag: "WCAG ライト"
+    wcag_theme_name: "WCAG ライト"
+    wcag_dark: "WCAG ダーク"
+    wcag_dark_theme_name: "WCAG ダーク"
     default_theme_name: "デフォルト"
+    light_theme_name: "ライト"
+    dark_theme_name: "ダーク"
+    neutral_theme_name: "ニュートラル"
+    grey_amber_theme_name: "グレーアンバー"
+    shades_of_blue_theme_name: "青系の色"
+    latte_theme_name: "ラテ"
+    summer_theme_name: "夏"
+    dark_rose_theme_name: "ダークローズ"
   edit_this_page: "このページを編集"
   csv_export:
     boolean_yes: "はい"
@@ -2054,7 +3585,7 @@ ja:
 
       ## [問題に遭遇したら、通報してください](#flag-problems)
 
-      モデレーターには特別の権限があり、このフォーラムの責任が課せられています。ただし、これはあなたにも同様です。あなたが協力することで、モデレーターは掃除係や警備員ではなく、コミュニティを改善する役割を果たすことができます。
+      モデレーターには特別な権限があり、このフォーラムの責任が課せられています。ただし、これはあなたにも同様です。あなたが協力することで、モデレーターは掃除係や警備員ではなく、コミュニティを改善する役割を果たすことができます。
 
       好ましくない行動に遭遇したら、返信しないこと。返信すると好ましくない行動を注目したことになり、それをエスカレートさせてしまい、あなたの労力を消費して、全員の時間を無駄にしてしまいます。_とにかく通報してください_。十分な数の通報が集まれば、自動的またはモデレーターの介入による何らかの対応が行われます。
 
@@ -2105,9 +3636,181 @@ ja:
 
       ## [利用規約](#tos)
 
-      法関連は退屈な内容ですが、私たち自身、それからあなたとあなたのデータを、悪意のある人たちから守らなければなりません。コンテンツ、プライバシー、そして法に関連するあなたの（および私たちの）の行動と権利を記述した[利用規約](%{base_path}/tos)が存在します。このサービスを使用するには、その[TOS](%{base_path}/tos)を順守することに同意する必要があります。
+      法関連は退屈な内容ですが、私たち自身、それからあなたとあなたのデータを、悪意のある人たちから守らなければなりません。コンテンツ、プライバシー、そして法に関連するあなたの (および私たちの) 行動と権利を記述した[利用規約](%{base_path}/tos)が存在します。このサービスを使用するには、その[TOS](%{base_path}/tos)を順守することに同意する必要があります。
   tos_topic:
     title: "利用規約"
+    body: |
+      <%{base_url}> のインターネットフォーラムの使用は、次の規約に準じます。フォーラムを使用するには、このフォーラムを運営している %{company_name} と本規約に合意する必要があります。
+
+      当社は、異なる規約の下でほかの製品やサービスを提供する場合があります。本規約はこのフォーラムの使用にのみ適用されます。
+
+      各項目にジャンプできます。
+
+      - [重要な規約](#heading--important-terms)
+      - [フォーラムを使用する権利](#heading--permission)
+      - [フォーラムの使用に際する条件](#heading--conditions)
+      - [許容される使用](#heading--acceptable-use)
+      - [コンテンツの標準](#heading--content-standards)
+      - [適用](#heading--enforcement)
+      - [アカウント](#heading--your-account)
+      - [コンテンツ](#heading--your-content)
+      - [あなたの責任](#heading--responsibility)
+      - [免責事項](#heading--disclaimers)
+      - [責任の制限](#heading--liability)
+      - [フィードバック](#heading--feedback)
+      - [解約](#heading--termination)
+      - [紛争](#heading--disputes)
+      - [一般規約](#heading--general)
+      - [連絡先](#heading--contact)
+      - [変更](#heading--changes)
+
+      <h2 id="heading--important-terms"><a href="#heading--important-terms">重要な規約</a></h2>
+
+      ***本規約には、「[免責事項](#heading--disclaimers)」に記載される免責事項、「[責任の制限](#heading--liability)」に記載される当社のあなたに対する責任の制限、「[あなたの使用に対する責任](#heading--responsibility)」に記載される、あなたの誤使用に起因する損害に対してあなたが当社を補償することへの合意、「[Disputes](#heading--disputes)」に記載される紛争を仲裁することの合意など、あなたの権利と責任に影響する重要な規定が多数含まれています。***
+
+      <h2 id="heading--permission"><a href="#heading--permission">フォーラムを使用する権利</a></h2>
+
+      本規約に従い、当社はあなたにフォーラムを使用する権限を付与します。本フォーラムの使用には、すべての人が本規約に同意する必要があります。
+
+      <h2 id="heading--conditions"><a href="#heading--conditions">フォーラムの使用に際する条件</a></h2>
+
+      フォーラムを使用するあなたの権利は、以下の条件に基づきます。
+
+      1. 13 歳以上であること。
+
+      2. 当社があなたに直接連絡し、使用できないと伝えられた場合、それ以降で本フォーラムを使用することはできません。
+
+      3. フォーラムの使用は、「[許容される使用](#heading--acceptable-use)」と「[コンテンツの標準](#heading--content-standards)」に従う必要があります。
+
+      <h2 id="heading--acceptable-use"><a href="#heading--acceptable-use">許容される使用</a></h2>
+
+      1. フォーラムを使用して違法行為を行ってはいけません。
+
+      2. 特定の許可がない限り、フォーラムで別のアカウントを使用したり、使用しようとしたりしてはいけません。
+
+      3. フォーラムでユーザー名またはその他の一意の ID を購入、販売、または交換してはいけません。
+
+      4. 商用のメーリングリストまたはデータベース用にアドレスまたはその他の個人データを収集する目的で、フォーラムを通じて、広告、チェーンレター、またはその他の勧誘を送信してはいけません。
+
+      5. フォーラムへのアクセスを自動化したり、ウェブクローラー、ブラウザのプラグインやアドオン、またはウェブブラウザ以外のその他のコンピュータープログラムなどを使ってフォーラムを監視したりしてはいけません。一般的に利用できる検索エンジン向けにインデックス化するためにフォーラムをクロールすることは可能です。
+
+      6. フォーラムを使用して、メールアドレスを配布リスト、ニュースグループ、またはグループメールのエイリアスに送信してはいけません。
+
+      7. 当社と提携している、または当社から承認されているという誤った情報を暗示してはいけません。
+
+      8. ほかのウェブページで、フォーラムにある画像やその他のハイパーテキスト以外のコンテンツにハイパーリンクすることはできません。
+
+      9. フォーラムからダウンロードした資料から、所有権を示すマークを削除することはできません。
+
+      10. ほかのウェブページに `<iframe>` を使用して、フォーラムのいかなる部分を表示してはいけません。
+
+      11. フォーラムのセキュリティまたはアクセス制限を無効、回避、または迂回してはいけません。
+
+      12. 不当な量のリクエスト、または不当な負荷をフォーラムの基盤となる情報システムにかけるように設計されたリクエストで、フォーラムのインフラストラクチャに負担をかけてはいけません。
+
+      13. フォーラムを通じて他人になりすましてはいけません。
+
+      14. 本規約の違反を促進したり、違反行為を支援したりしてはいけません。
+
+      <h2 id="heading--content-standards"><a href="#heading--content-standards">コンテンツ基準</a></h2>
+
+      1. 違法、攻撃的、または他の人に有害なコンテンツをフォーラムに送信してはいけません。 これには、嫌がらせ、不適切、または虐待的なコンテンツが含まれます。
+
+      2. 法に違反したり、他人の知的財産権を侵害したり、他人のプライバシーを侵害したり、他者との契約に違反したりするコンテンツをフォーラムに送信してはいけません。
+
+      3. コンピューターウイルスやスパイウェアなどの悪意のあるコンピューターコードを含むコンテンツをフォーラムに送信してはいけません。
+
+      4. 特定のアドレス、ユーザー名、またはその他の一意の ID を保持するために、単なるプレースホルダーとしてコンテンツをフォーラムに送信してはいけません。
+
+      5. 他人の機密情報や個人情報など、開示する権利がない情報を開示するためにフォーラムを使用してはいけません。
+
+      <h2 id="heading--enforcement"><a href="#heading--enforcement">適用</a></h2>
+
+      当社は、本規約の違反を法的に最大限に調査し、起訴することができます。当社は、法および本規約の違反を起訴する際に法執行当局に通知し、協力する場合があります。
+
+      当社は、いかなる理由においても、フォーラムのコンテンツを変更、編集、および削除する権利を留保します。誰かが本規約に違反してフォーラムにコンテンツを送信したと思われる場合は、[直ちに連絡してください](#heading--contact)。
+
+      <h2 id="heading--your-account"><a href="#heading--your-account">あなたのアカウント</a></h2>
+
+      フォーラムの一部の機能を使用するには、アカウントを作成してログインする必要があります。
+
+      アカウントを作成するには、あなた自身の情報を提供する必要があります。アカウントを作成する場合、最小限、有効なメールアドレスを提供すること、並びに当該メールアドレスを最新の状態に維持することに同意する必要があります。アカウントの閉鎖はいつでもメール <%{contact_email}> で行うことができます。
+
+      あなたは、あなたがアカウントを閉鎖するかアカウントが侵害されたことを当社に通知するまで、あなたが許可したかどうかにかかわらず、あなたのアカウントを使用して取られたすべての行動に責任を負うことに同意します。アカウントが侵害された疑いがある場合は、すぐに当社に通知することに同意します。アカウントに安全なパスワードを選択し、秘密に保管しておくことに同意します。
+
+      当社は、著作権関連の削除リクエストを処理するためのポリシーに従って、または当社が本規約の規則に違反したと合理的に信じる場合、フォーラムでのアカウントを制限、凍結、または閉鎖することができます。
+
+      <h2 id="heading--your-content"><a href="#heading--your-content">あなたのコンテンツ</a></h2>
+
+      本規約のいずれも、アカウント情報、投稿、またはフォーラムに送信するその他のコンテンツなど、フォーラムと共有する知的財産の所有権を当社に付与するものではありません。本規約のいずれも、当社の知的財産の所有権をあなたに与えるものではありません。
+
+      あなたと当社の間で、あなたは、あなた自身がフォーラムに送信するコンテンツに対する責任を一切負います。あなたは、あなたがフォーラムに送信するコンテンツが当社によって後援または承認されていることを誤って暗示しないことに同意します。本規約は、本規約の下に、送信したコンテンツのコピーを保存、維持、または提供し、変更することを当社に義務付けるものではありません。
+
+      フォーラムに送信するコンテンツはあなたに帰属し、そのコンテンツに対するどのような権利をほかの人に付与するかをあなたが決定します。ただし、少なくとも、フォーラムに送信するコンテンツをフォーラムの他のユーザーに提供することを当社に許可します。その特別なライセンスにより、当社はあなたがフォーラムに送信したコンテンツをコピー、公開、分析することができます。
+
+      あなたが送信したコンテンツがあなたまたは当社によってフォーラムから削除された場合、最後のコピーが当社のバックアップ、キャッシュ、およびその他のシステムから消去された時点で、当社の特別ライセンスは終了します。[クリエイティブコモンズ](https://creativecommons.org)ライセンスなど、送信するコンテンツに適用するその他のライセンスは、コンテンツが削除された後も継続する場合があります。これらのライセンスは、他の人または当社に、フォーラムを通じてコンテンツを再度共有する権利を与える場合があります。
+
+      あなたがフォーラムに送信したコンテンツを受け取る他の人は、あなたがあなたのコンテンツにライセンスを与える条件に違反する可能性があります。あなたは、それらの違反またはその結果について当社があなたに対する責任を負わないことに同意します。
+
+      <h2 id="heading--responsibility"><a href="#heading--responsibility">あなたの責任</a></h2>
+
+      あなたは、本規約の違反に関連する他者による法的請求、またはフォーラムのあなたのアカウントを使用する他者による本規約の違反に対し当社を補償することに同意します。あなたと当社の両者は、あなたが可能な限り速やかに補償する必要がある可能性のある法的請求について、相手に通知することに同意します。当社が法的請求について迅速に通知しなかった場合、迅速な通知によって防御または軽減できた可能性のある損害について、あなたは当社に補償する必要はありません。あなたは、当社に補償しなければならない法的請求の調査、防御、および和解を当社が管理することを許可し、その取り組みに協力することに同意します。当社は、あなたからの事前の同意なしに、あなたの過失を認めたり、あなたに義務を課したりするいかなる和解にも同意しないことに同意します。
+
+      <h2 id="heading--disclaimers"><a href="#heading--disclaimers">免責事項</a></h2>
+
+      ***あなたは、フォーラムおよびフォーラムのコンテンツを使用するすべてのリスクを受け入れます。法で認められる限り、当社とそのサプライヤーは、いかなる保証もなく、フォーラムを現状のまま提供します。***
+
+      フォーラムは、他社が運営するフォーラムやサービスにハイパーリンクして統合する場合があります。会社は、他者が運営するサービス、または他者が提供する可能性のあるコンテンツについて、いかなる保証も行いません。他者が実行するサービスの使用は、あなたと当該サービスを実行している人との間に存在する別の規約に準拠する可能性があります。
+
+      <h2 id="heading--liability"><a href="#heading--liability">責任の制限</a></h2>
+
+      ***当社もそのサプライヤーも、あなたが本規約に同意したときに担当者が合理的に予見できなかった契約違反の損害についてあなたに対する責任を負いません。***
+
+      ***法で認められる限り、フォーラムまたはフォーラムのコンテンツに関連するあらゆる種類の請求に対するあなたへの全責任の上限は、50 ドルとします。***
+
+      <h2 id="heading--feedback"><a href="#heading--feedback">フィードバック</a></h2>
+
+      当社は、フォーラムのフィードバックと提案を歓迎しています。お問い合わせ方法については、以下の「[連絡先](#heading--contact)」セクションをご覧ください。
+
+      あなたは、当社があなたが提供するフィードバックや提案に自由に対応できること、そしてあなたのフィードバックが使用されたことを当社があなたに通知したり、それを使用する許可を得たり、あなたに支払いをしたりする必要がないことに同意します。あなたは、あなたや他者に、機密または専有であると思われるフィードバックや提案を送信しないことに同意します。
+
+      <h2 id="heading--termination"><a href="#heading--termination">解約</a></h2>
+
+      あなたまたは当社のいずれかは、本規約に記載された契約をいつでも終了することができます。契約が終了すると、フォーラムの使用許可も終了します。
+
+      次の規定は、当社の契約の終了後も存続します: [あなたのコンテンツ](#heading--your-content)、[フィードバック](#heading--feedback)、[あなたの責任](#heading--responsibility)、[免責事項](#heading--disclaimers)、[責任の制限](#heading--liability)、および [一般規約](#heading--general)。
+
+      <h2 id="heading--disputes"><a href="#heading--disputes">紛争</a></h2>
+
+      %{governing_law}は、本規約またはフォーラムの使用に関連する紛争を管理します。
+
+      あなたと当社は、%{city_for_disputes}の州裁判所または連邦裁判所でのみ、これらの条件に関連する差止命令を求めることに同意します。
+
+      ***コンピューター犯罪取締法に基づく差止命令または請求を求める場合を除き、あなたと当社は、米国仲裁協会 (AAA) の仲裁を拘束することにより、紛争を解決します。仲裁は、AAA の商事仲裁規則および消費者関連紛争の補足手順に従います。仲裁は%{city_for_disputes}で行われます。紛争は、原告または集団メンバーのいずれであっても、集団訴訟またはその他の代表訴訟の一部としてではなく、個人として解決するものとします。仲裁人は、当社の許可なしに他の仲裁と紛争を統合することはありません。***
+
+      仲裁裁定には、仲裁の費用、合理的な弁護士費用、および証人の合理的な費用が含まれます。あなたと当社は、管轄権を有する任意の裁判所で仲裁裁定を下すことができます。
+
+      <h2 id="heading--general"><a href="#heading--general">一般規約</a></h2>
+
+      本規約の条項が書面で執行不能であるが、執行可能にするために変更される可能性がある場合、その条項は、執行可能にするために必要な最小限の範囲で変更する必要があります。それ以外の場合は、その規定を削除する必要があります。
+
+      当社との契約を譲渡することはできません。当社は、当社の関連会社、当社の支配権を取得する他の会社、またはフォーラムに関連する当社の資産を購入する他社にあなたとの契約を割り当てることができます。本規約に反する割り当てを試みても、法的効力はありません。
+
+      本契約に基づく権利の行使も、本契約の違反の放棄も、本契約の他の違反を放棄するものではありません。
+
+      本規約は、フォーラムの使用に関するあなたと当社の間のすべての契約条件を具体化したものです。 本規約は、書面であるかどうかにかかわらず、フォーラムの使用に関する他の合意に完全に置き換わるものです。
+
+      <h2 id="heading--contact"><a href="#heading--contact">連絡先</a></h2>
+
+      あなたは本規約の下、<%{contact_email}> に連絡またはお問い合わせいただけます。
+
+      当社は本規約の下、フォーラムのアカウントで提供されたあなたのメールアドレスを使用して、またはフォーラムまたはあなたのアカウントページにメッセージを投稿して、あなたに連絡することができます。
+
+      <h2 id="heading--changes"><a href="#heading--changes">変更</a></h2>
+
+      本規約の最終更新は 2018 年 7 月 12 日です。また、本規約を再度更新する可能性があります。当社はすべての更新をフォーラムに投稿します。大幅な変更を含む更新については、あなたがアカウントを作成して有効なメールアドレスを提供しる場合に、当社はあなたにメールを送信することに同意します。当社はまた、フォーラムで特別なメッセージやアラートで更新を発表する場合があります。
+
+      フォーラムを使用し続けるには、本規約への更新の通知を受信したら、その新しい規約に同意する必要があります。
   privacy_topic:
     title: "プライバシーポリシー"
     body: |
@@ -2193,37 +3896,87 @@ ja:
 
       この文章のライセンスはCC-BY-SAです。最終更新: 2013 年 5 月 31 日
   badges:
+    mass_award:
+      errors:
+        invalid_csv: '%{line_number} 行目でエラーが発生しました。メールが 1 行ごとに 1 件あることを CSV で確認してください。'
+        too_many_csv_entries: CSV ファイルのエントリが多すぎます。%{count} エントリ以下の CSV ファイルを提供してください。
+        badge_disabled: 先に %{badge_name} バッジを有効にしてください。
+        cant_grant_multiple_times: 1 人のユーザーに %{badge_name} バッジを何度も付与することはできません。
     editor:
       name: 編集者
       description: はじめての投稿編集
+      long_description: |
+        このバッジは、投稿の 1 つを初めて編集したときに付与されます。投稿を永遠に編集することはできませんが、編集することをお勧めします。フォーマットを改善したり、小さな間違いを修正したり、最初に投稿したときに欠落していたものを追加したりすることができます。編集して投稿をさらに改善しましょう！
+    wiki_editor:
+      name: ウィキエディター
+      description: はじめてのウィキ編集
+      long_description: |
+        このバッジは、初めてウィキ投稿を編集したときに付与されます。
     basic_user:
       name: ベーシック
+      description: すべての基本コミュニティ機能を<a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">付与</a>しました
+      long_description: |
+        このバッジはユーザーが信頼レベル 1 に達すると付与されます。コミュニティの内容を理解するために、いくつかのトピックを読み続けていただきありがとうございます。新規ユーザーの制限は解除され、個人メッセージ、ウィキ編集、複数の画像とリンクを投稿する機能など、すべての基本的なコミュニティ機能が付与されています。
     member:
       name: メンバー
+      description: 招待、グループメッセージ、「いいね！」の増加を<a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">付与</a>しました
+      long_description: |
+        このバッジは、信頼レベル 2 に達すると付与されます。数週間にわたって、コミュニティにしっかりと参加していただきありがとうございました。ユーザーページまたは個別のトピックからの招待状の送信、グループ個人メッセージの作成、1 日の「いいね！」の増量が付与されています。
     regular:
       name: レギュラー
+      description: カテゴリ整理、名前変更、フォローリンク、ウィキ、「いいね！」の増加を<a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">付与</a>しました
+      long_description: |
+        このバッジは、信頼レベル 3 に達すると付与されます。数か月に渡り、コミュニティに定期的に参加していただきありがとうございました。これで、最もアクティブな読者の 1 人となり、コミュニティを素晴らしいものにしてくれる信頼ある貢献者となりました。カテゴリ整理やトピックの名前変更、より強力な迷惑通報の利用、非公開ラウンジエリアへのアクセスが可能となり、1 日当たりの「いいね！」が増えています。
     leader:
       name: リーダー
+      description: グローバル編集、固定、クローズ、アーカイブ、分割とマージ、「いいね！」の増加を<a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">付与</a>しました
+      long_description: |
+        このバッジは、信頼レベル 4 に達すると付与されます。あなたはこのコミュニティのリーダーとしてスタッフに選ばれ、ここでのあなたのアクションや言葉でコミュニティの他のメンバーに前向きな姿勢を示しています。すべての投稿を編集できるほか、表示固定、クローズ、リストから非表示、アーカイブ、分割、マージなどの一般的なトピックモデレーターアクションを実行できるようになりました。
     welcome:
       name: ようこそ
       description: '「いいね！」をゲット'
+      long_description: |
+        このバッジは、投稿ではじめて「いいね！」をもらった時に付与されます。おめでとうございます。ほかのコミュニティメンバーが面白い、すごい、または有益だと思う内容を投稿しました！
     autobiographer:
       name: 自伝作家
+      description: <a href="%{base_uri}/my/preferences/profile">プロフィール</a>情報を入力しました
+      long_description: |
+        このバッジは、<a href="%{base_uri}/my/preferences/profile">あなたのユーザープロフィール</a>を入力し、プロフィール写真を選択したときに付与されます。コミュニティにあなたのことやあなたが興味のあることを知らせることで、より緊密なコミュニティを作ることができます。参加しましょう！
     anniversary:
       name: アニバーサリー
       description: 1 回は投稿したことのあるメンバー歴 1 年のアクティブメンバー
+      long_description: |
+        このバッジは、1 年間メンバーであり、その年に少なくとも 1 件の投稿がある場合に付与されます。参加を続け、コミュニティに貢献していただきありがとうございました。あなたなしでは続けられません。
     nice_post:
       name: ナイスな返事
+      description: 返信に 10 個の「いいね！」を受け取りました
+      long_description: |
+        このバッジは、あなたの返信に「いいね！」が 10 個つけられたときに付与されます。あなたの返信はコミュニティに感動を与え、会話を前進させるのに役立ちました。
     good_post:
       name: イカした返事
+      description: 返信に 25 個の「いいね！」を受け取りました
+      long_description: |
+        このバッジは、あなたの返信に「いいね！」が 25 個つけられたときに付与されます。あなたの返信は並外れており、会話をはるかに面白いものにしました。
     great_post:
       name: グレートな返事
+      description: 返信に 50 個の「いいね！」を受け取りました
+      long_description: |
+        このバッジは、あなたの返信に「いいね！」が 50 個つけられたときに付与されます。わぉ！あなたの返信は刺激的、魅力的、陽気、もしくは洞察に満ちていて、コミュニティにとても気に入られました！
     nice_topic:
       name: ナイスなトピック
+      description: トピックに 10 個の「いいね！」を受け取りました
+      long_description: |
+        このバッジは、あなたのトピックに「いいね！」が 10 個つけられたときに付与されます。あなたはコミュニティが楽しんだ興味深い会話を始めました。
     good_topic:
       name: イカしたトピック
+      description: トピックに 25 個の「いいね！」を受け取りました
+      long_description: |
+        このバッジは、あなたのトピックに「いいね！」が 25 個つけられたときに付与されます。あなたはコミュニティを結集させ、活気に満ちた会話を始めました。
     great_topic:
       name: グレートなトピック
+      description: トピックに 50 個の「いいね！」を受け取りました
+      long_description: |
+        このバッジは、あなたのトピックに「いいね！」が 50 個つけられたときに付与されます。あなたが始めた魅力的な会話から活気にあふれるディスカッションが生まれ、コミュニティに気に入られました！
     nice_share:
       name: ナイスな共有
       description: 25 人の訪問者に投稿を共有
@@ -2232,9 +3985,13 @@ ja:
     good_share:
       name: イカした共有
       description: 300 人の訪問者に投稿を共有
+      long_description: |
+        このバッジは、300 人の外部訪問者がクリックしたリンクを共有したときに付与されます。よくできました！あなたはたくさんの新しい人々に素晴らしいディスカッションを披露し、このコミュニティの成長を助けました。
     great_share:
       name: グレートな共有
       description: 1000 人の訪問者に投稿を共有
+      long_description: |
+        このバッジは、1000 人の外部訪問者がクリックしたリンクを共有したときに付与されます。わぉ！あなたは大勢の新しいオーディエンスに興味深いディスカッションを促進し、コミュニティを大きく成長させることに役立ちました！
     first_like:
       name: 初めての「いいね！」
       description: 投稿に「いいね！」した
@@ -2253,9 +4010,13 @@ ja:
     campaigner:
       name: 活動家
       description: ベーシックユーザー 3 人を招待
+      long_description: |
+        このバッジは、あなたが招待した 3 人がサイトで十分な時間を費やしてベーシックユーザーとなったときに付与されます。コミュニティの活気を維持するには、定期的に参加して会話に新しい意見を加える新人が定期的に加わる必要があります。
     champion:
       name: チャンピオン
       description: メンバー 5 人を招待
+      long_description: |
+        このバッジは、あなたが招待した 5 人がサイトで十分な時間を費やしてフルメンバーとなったときに付与されます。わぉ！新しいメンバーを招待し、コミュニティの多様性を拡大してくれてありがとうございました！
     first_share:
       name: 初めてのシェア
       description: 投稿を共有した
@@ -2274,6 +4035,8 @@ ja:
     read_guidelines:
       name: ガイドライン読者
       description: <a href="%{base_uri}/guidelines">コミュニティガイドライン</a>を読んだ
+      long_description: |
+        このバッジは、<a href="%{base_uri}/guidelines">コミュニティガイドライン</a>を読んだときに付与されます。これらの簡単なガイドラインに従い、共有することで、全員にとって安全で楽しく持続可能なコミュニティを構築することができます。画面の向こうには、あなたのような人がいることを常に忘れないでください。親切に接しましょう！
     reader:
       name: 読者
       description: 1 つのトピックに 100 件以上ある返信をすべて読んだ
@@ -2311,10 +4074,19 @@ ja:
         このバッジは、300 件の異なる投稿で「いいね！」を 5 つ以上もらったときに付与されます。コミュニティは頻繁で質の高いあなたの投稿を心待ちにしています。
     out_of_love:
       name: 愛情
+      description: 1 日に %{max_likes_per_day} 個の「いいね！」を使用しました
+      long_description: |
+        このバッジは、1 日の「いいね！」の全 %{max_likes_per_day} 個を使用したときに付与されます。ちょっと立ち止まって、あなたが楽しんだり称賛したりした投稿に「いいね！」をつけることで、ほかのコミュニティメンバーがさらに素晴らしいディスカッションを作成していく励みになります。
     higher_love:
       name: 愛だらけ
+      description: 1 日の %{max_likes_per_day} 個の「いいね！」を 5 回使用しました
+      long_description: |
+        このバッジは、1 日の「いいね！」を全 %{max_likes_per_day} 個 5 日間使用したときに付与されます。最高の会話を積極的に奨励することに時間を割いていただきありがとうございました！
     crazy_in_love:
       name: 愛は盲目
+      description: 1 日の %{max_likes_per_day} 個の「いいね！」を 20 回使用しました
+      long_description: |
+        このバッジは、1 日の「いいね！」を全 %{max_likes_per_day} 個 20 日間使用したときに付与されます。わぉ！あなたはコミュニティメンバーを励ますロールモデルです！
     thank_you:
       name: ありがとう
       description: もらった「いいね！」が 20 個、あげた「いいね！」が10 個
@@ -2328,6 +4100,8 @@ ja:
     empathetic:
       name: 共感
       description: もらった「いいね！」が 500 個、あげた「いいね！」が1000 個
+      long_description: |
+        このバッジは、500 件の投稿に「いいね！」し、1000 個以上の「いいね！」を受け取ったときに付与されます。わぉ！あなたは寛大さと相互感謝の鏡です :two_hearts:
     first_emoji:
       name: はじめての絵文字
       description: 投稿に絵文字を使った
@@ -2355,12 +4129,25 @@ ja:
         このバッジは、投稿が「いいね！」される頻度と「いいね！」した人を基に総合的な貢献度を讃えるバッジで、毎月 2 人の新規ユーザーに付与されます。
     enthusiast:
       name: 熱狂者
+      description: 10 日連続でアクセスしました
+      long_description: |
+        このバッジは、10 日連続でアクセスしたときに付与されます。1 週間以上お付き合いいただきありがとうございました！
     aficionado:
       name: 愛好家
+      description: 100 日連続でアクセスしました
+      long_description: |
+        このバッジは、100 日間連続でアクセスしたときに付与されます。3 か月以上です！
     devotee:
       name: 献身者
+      description: 365 日連続でアクセスしました
+      long_description: |
+        このバッジは、365 日間連続でアクセスしたときに付与されます。なんと、丸 1 年間です！
+    badge_title_metadata: "%{site_title} の %{display_name} バッジ"
   admin_login:
     success: "メールを送信しました"
+    errors:
+      unknown_email_address: "不明なメールアドレスです。"
+      invalid_token: "無効なトークンです。"
     email_input: "管理者メール"
     submit_button: "メールを送信"
   performance_report:
@@ -2368,24 +4155,96 @@ ja:
     initial_topic_title: ウェブサイトパフォーマンスレポート
   tags:
     title: "タグ"
+    restricted_tag_disallowed: 'タグ "%{tag}" を適用できません。'
+    restricted_tag_remove_disallowed: 'タグ "%{tag}" を削除できません。'
+    minimum_required_tags:
+      other: "少なくとも %{count} 個のタグを選択する必要があります。"
+    upload_row_too_long: "CSV ファイルには 1 行につき 1 つのタグが必要です。オプションで、タグの後にカンマを付け、その後のグループ名を続けることができます。"
+    forbidden:
+      invalid:
+        other: "選択したタブはどれも使用できません"
+      in_this_category: '"%{tag_name}" をこのカテゴリで使用できません'
+      restricted_to:
+        other: '"%{tag_name}" は次のカテゴリに制限されています: %{category_names}'
+      synonym: '同義語は許可されていません。代わりに "%{tag_name}" を使用してください。'
+      has_synonyms: '"%{tag_name}" は同義語が含まれるため使用できません。'
+    required_tags_from_group:
+      other: "少なくとも %{count} 個の %{tag_group_name} タグを含める必要があります。このグループのタグ: %{tags}。"
+    invalid_target_tag: "同義語の同義語にすることはできません"
+    synonyms_exist: "は同義語が存在する限り許可されません"
+  rss_by_tag: "%{tag} がタグ付けされたトピック"
   finish_installation:
+    congratulations: "おめでとうございます。Discourse をインストールしました！"
     register:
       button: "登録"
+      title: "管理者アカウントの登録"
+      help: "まず、新しいアカウントを登録してください"
+      no_emails: "残念ながら、セットアップ中に管理者メールが定義されなかったため、構成を完了するのが困難です。構成ファイルに開発者のメールを追加するか、<a href='https://meta.discourse.org/t/create-admin-account-from-console/17274'>コンソールから管理者アカウントを作成</a>してください。"
+    confirm_email:
+      title: "メールの確認"
+      message: "<p><b>%{email}</b> にアクティベーションメールを送信しました。メールに記載の指示に従って、アカウントを有効化してください。</p><p>そのメールが届かない場合は、迷惑フォルダをご確認の上、<a href='https://meta.discourse.org/t/troubleshooting-email-on-a-new-discourse-install/16326'>メールが正しくセットアップされていることを確認</a>してください。</p>"
     resend_email:
       title: "アクティベーションメールの再送"
+      message: "<p><b>%{email}</b> にアクティベーションメールを再送信しました"
+  safe_mode:
+    title: "セーフモードを開始"
+    description: "セーフモードでは、プラグインやサイトのカスタマイズを読み込まずにサイトをテストすることができます。"
+    no_customizations: "現在のテーマを無効にする"
+    only_official: "非公式のプラグインを無効にする"
+    no_plugins: "すべてのプラグインを無効にする"
+    enter: "セーフモードを開始"
+    must_select: "セーフモードを開始するには、少なくとも 1 つのオプションを選択する必要があります。"
   wizard:
+    title: "Discourse のセットアップ"
     step:
+      locale:
+        title: "Discourse へようこそ！"
+        fields:
+          default_locale:
+            description: "コミュニティで使用するデフォルトの言語は何ですか？"
       forum_title:
         title: "名前"
+        description: "あなたの名前は遠くから見える標識であり、潜在的な訪問者がコミュニティについて<i>最初</i>に気づくものです。名前とタイトルはコミュニティをどのように説明していますか？"
+        fields:
+          title:
+            label: "コミュニティの名前"
+            placeholder: "純子のたまり場"
+          site_description:
+            label: "コミュニティについて簡単な一文で説明してください"
+            placeholder: "純子と純子の仲間がワイワイする場所"
+          short_site_description:
+            label: "コミュニティについて短い言葉で説明してください"
+            placeholder: "史上最高のコミュニティ"
+      introduction:
+        title: "紹介"
+        disabled: "<p>タイトル “%{topic_title}” のトピックが見つかりませんでした。</p><ul><li>タイトルを変更した場合は、トピックを編集してサイトの紹介文を変更してください。</li><li>このトピックを削除してしまった場合は、タイトルが “%{topic_title}” の別のトピックを作成してください。最初の投稿のコンテンツはあなたのサイトの紹介文です。</li></ul>"
+        fields:
+          welcome:
+            label: "ようこそ - トピック"
+            description: "<p>エレベーターで約 1 分間、知らない人にどのようにコミュニティを説明しますか？</p><ul><li>誰を対象にしたディスカッションか</li><li>ここで何を見つけられるか</li><li>なぜアクセスする必要があるのか</li></ul><p>新たにたどり着いた人が最初に読むのがあなたのようこそトピックです。<b>1 段落</b>にまとめた 'エレベーターピッチ' または 'ミッションステートメント' として考えてください。 </p>"
+            one_paragraph: "ようこそメッセージを 1 段落に制限してください。"
+            extra_description: "よくわからない場合は、このステップを省略して、後でようこそトピックを編集することができます。"
       privacy:
         title: "アクセス"
+        description: "<p>あなたのコミュニティは誰にでもオープンされていますか、それともメンバーシップ、招待、または承認によって制限されていますか？必要に応じて、非公開でセットアップしてから、後で公開に切り替えることができます。</p>"
         fields:
           privacy:
             choices:
               open:
                 label: "公開"
+                description: "このコミュニティには誰でもアクセスできる"
               restricted:
                 label: "非公開"
+                description: "ログインユーザーのみがこのコミュニティにアクセスできる"
+          privacy_options:
+            description: "新しいユーザーはどのようにしてアカウントに登録しますか？"
+            choices:
+              open:
+                label: "ユーザーは自己登録できます。"
+              invite_only:
+                label: "ユーザーは信頼できるユーザーまたはスタッフから招待されてから登録する必要があります。"
+              must_approve:
+                label: "ユーザーは自己登録できますが、スタッフによる承認が必要です。"
       contact:
         title: "連絡先"
         fields:
@@ -2402,14 +4261,46 @@ ja:
             description: "通報の警告やバックアップ完了の通知など、Discourse のすべての自動個人メッセージはこのユーザーから送信されます。"
       corporate:
         title: "組織"
+        description: "この情報は、あなたの<a href='%{base_path}/tos' target='blank'>利用規約</a>に入力されます。これは、「スタッフ」カテゴリで編集できるトピックです。会社がない場合は、今のところはこのステップを省略できます。"
+        fields:
+          company_name:
+            label: "会社名"
+            placeholder: "組織の例"
+          governing_law:
+            label: "準拠法"
+            placeholder: "カリフォルニア州法"
+          city_for_disputes:
+            label: "紛争都市"
+            placeholder: "カリフォルニア州サンフランシスコ"
       colors:
         title: "色"
       fonts:
+        title: "フォント"
         fields:
+          body_font:
+            label: "本文のフォント"
+          heading_font:
+            label: "見出しのフォント"
           font_preview:
             label: "プレビュー"
+      logos:
+        title: "ロゴ"
+        fields:
+          logo:
+            label: "プライマリーロゴ"
+            description: "サイトの左上にあるロゴ画像です。高さ 120、縦横比 3：1を超える広幅の長方形の画像を使用してください。"
+          logo_small:
+            label: "正方形のロゴ"
+            description: "正方形バージョンのロゴ。ブラウザで下にスクロールしたときにサイトの左上に、またソーシャルプラットフォームで共有したときに表示されます。512x512 よりも大きいサイズが最適です。"
       icons:
         title: "アイコン"
+        fields:
+          favicon:
+            label: "ブラウザアイコン"
+            description: "ウェブブラウザでサイトを表現するために使用され、小さいサイズで見栄えが良いアイコン画像。推奨される画像の拡張子は PNG または JPG です。デフォルトでは正方形のロゴを使用します。"
+          large_icon:
+            label: "大きなアイコン"
+            description: "最新のデバイスでサイトを表現するために使用され、大きなサイズで見栄えの良いアイコン画像。512 × 512 より大きいサイズが最適です。デフォルトでは正方形のロゴを使用します。"
       homepage:
         description: "ホームページには最新トピックを表示することを推奨しますが、カテゴリ (トピックをグループ化したもの) を表示することもできます。"
         title: "ホームページ"
@@ -2426,6 +4317,22 @@ ja:
                 label: "カテゴリと最新トピック"
               categories_and_top_topics:
                 label: "カテゴリと人気トピック"
+              categories_boxes:
+                label: "カテゴリボックス"
+              categories_boxes_with_topics:
+                label: "トピック付きのカテゴリボックス"
+      invites:
+        title: "スタッフの招待"
+        description: "ほぼ完了です！コミュニティを始動させるために、興味深いトピックや返信で<a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>ディスカッションを生み出せる</a>人を何人が招待しましょう。"
+        disabled: "ローカルログインが無効になっているため、誰にも招待状を送れません。次のステップに進んでください。"
+      finished:
+        title: "あなたの Discourse の準備が整いました！"
+        description: |
+          <p>これらの設定を変更することがある場合は、<b>いつでもこのウィザードを実行</b>するか、<a href='%{base_path}/admin' target='_blank'>あなたの管理者セクション</a>にアクセスしてください。このセクションはサイトメニューのレンチアイコンの横にあります。</p>
+          <p>強力なテーマシステムを使用すると、Discourse をさらにカスタマイズすることができます。たとえば、<a href="https://meta.discourse.org/" target="_blank">meta.discourse.org</a> で<a href="https://meta.discourse.org/c/theme/61/l/top" target="_blank">人気のテーマやコンポーネント</a>をご覧ください。</p>
+          <p>それでは、<a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>新しいコミュニティの構築</a>をお楽しみください！</p>
+  search_logs:
+    graph_title: "検索数"
   joined: "参加"
   discourse_push_notifications:
     popup:
@@ -2434,34 +4341,155 @@ ja:
       quoted: '%{username} が「%{topic}」であなたを引用しました - %{site_title}'
       replied: '%{username} が「%{topic}」であなたに返信しました - %{site_title}'
       posted: '%{username} が「%{topic}」に投稿しました - %{site_title}'
+      private_message: '"%{topic}" で %{username} があなたにプライベートメッセージを送信しました - %{site_title}'
       linked: '%{username} が「%{topic}」のあなたの投稿にリンクしました - %{site_title}'
       watching_first_post: '%{username} が新規トピック「%{topic}」を作成しました - %{site_title}'
       confirm_title: "通知を有効にしました - %{site_title}"
       confirm_body: "成功！通知を有効にしました！"
+      custom: "%{site_title} の %{username} からの通知"
+  staff_action_logs:
+    not_found: "は見つかりません"
+    unknown: "不明"
+    user_merged: "%{username} がこのアカウントにマージされました"
+    user_delete_self: "%{url} から自分で削除"
+    webhook_deactivation_reason: "あなたの Webhook は自動的に無効化されています。複数の '%{status}' HTTP ステータス失敗応答を受信しました。"
+    api_key:
+      automatic_revoked:
+        other: "自動的に取り消されました。最後のアクティビティは %{count} 日以上前です"
+      revoked: 取り消し済み
+      restored: 復元済み
   reviewables:
+    already_handled: "その投稿をすでにレビューし、再通報の必要はないと判断しました。"
+    already_handled_and_user_not_exist: "誰かがすでにレビュー済みで、そのユーザーはもう存在しません。"
     priorities:
+      low: "低"
       medium: "普通"
       high: "高"
     sensitivity:
       disabled: "無効化"
+      low: "低"
       medium: "普通"
       high: "高"
+    must_claim: "対応する前に項目を自分に割り当てる必要があります。"
+    user_claimed: "この項目は別のユーザーに割り当てられています。"
+    missing_version: "バージョンパラメーターを指定する必要があります"
+    conflict: "更新の競合があるため、それを行えませんでした。"
+    reasons:
+      post_count: "すべてのユーザーの最初の数件の投稿はスタッフによって承認される必要があります。`approve_post_count` をご覧ください。"
+      trust_level: "信頼レベルが低いユーザーはその返信をスタッフが承認する必要があります。`approve_unless_trust_level` をご覧ください。"
+      new_topics_unless_trust_level: "信頼レベルが低いユーザーはそのトピックをスタッフが承認する必要があります。`pprove_new_topics_unless_trust_level` をご覧ください。"
+      fast_typer: "新規ユーザーは、最初の投稿を、ボットまたは迷惑行為者と疑われる速さで入力しました。`min_first_post_typing_time` をご覧ください。"
+      auto_silence_regexp: "最初の投稿が `auto_silence_first_post_regex` 設定に一致する新規ユーザー。"
+      watched_word: "この投稿にはウォッチ語が含まれていました。<a href='%{base_url}/admin/customize/watched_words'>ウォッチ語のリスト</a>をご覧ください"
+      staged: "ステージングユーザーの新しいトピックと投稿はスタッフによる承認が必要です。`approve_unless_staged` をご覧ください。"
+      category: "このカテゴリの投稿には、スタッフによる手動の承認が必要です。カテゴリ設定をご覧ください。"
+      must_approve_users: "すべての新規ユーザーはスタッフによる承認が必要です。`must_approve_users` をご覧ください。"
+      invite_only: "すべての新規ユーザーは招待される必要があります。`invite_only` をご覧ください。"
+      email_auth_res_enqueue: "このメールは DMARC チェックに失敗しました。これは誰からのものでもないようです。詳細については、生のメールヘッダーを確認してください。"
+      email_spam: "このメールは、`email_in_spam_header` に定義されているヘッダーによって、迷惑として通報されました。"
+      suspect_user: "この新規ユーザーは、トピックまたは投稿を一切読まずにプロフィール情報を入力しました。これは、迷惑行為者であることを強く示唆しています。`approve_suspect_users` をご覧ください。"
+      contains_media: "この投稿には埋め込みメディアが含まれています。`review_media_unless_trust_level` をご覧ください。"
+      queued_by_staff: "スタッフメンバーは、この投稿にレビューが必要だと考えています。それまで非表示のままになります。"
     actions:
+      agree:
+        title: "合意…"
+      agree_and_keep:
+        title: "投稿を維持"
+        description: "通報に合意し、投稿を変更しないままにします。"
+      agree_and_keep_hidden:
+        title: "投稿を非表示のままに維持"
+        description: "通報に合意し、投稿を非表示のままにします。"
       agree_and_suspend:
         title: "ユーザーの凍結"
+        description: "通報に合意し、ユーザーを凍結します。"
+      agree_and_silence:
+        title: "ユーザーを投稿禁止"
+        description: "通報に同意し、ユーザーを投稿禁止にします。"
+      agree_and_restore:
+        title: "投稿の復元"
+        description: "すべてのユーザーが閲覧できるように投稿を復元します。"
+      agree_and_hide:
+        title: "投稿を非表示"
+        description: "この投稿を非表示にして、ユーザーに投稿の編集を促すメッセージをユーザーに送信します。"
       delete_single:
         title: "削除"
+      delete:
+        title: "削除…"
+      delete_and_ignore:
+        title: "投稿の削除と無視"
+        description: "投稿を削除します。最初の投稿である場合、トピックも削除されます"
+      delete_and_ignore_replies:
+        title: "投稿と返信を削除して無視する"
+        description: "投稿とそのすべての返信を削除します。最初の投稿である場合、トピックも削除されます"
+        confirm: "投稿への返信も削除してよろしいですか？"
+      delete_and_agree:
+        title: "投稿の削除と同意"
+        description: "投稿を削除します。最初の投稿である場合、トピックも削除されます"
+      delete_and_agree_replies:
+        title: "投稿と返信を削除して同意する"
+        description: "投稿とそのすべての返信を削除します。最初の投稿である場合、トピックも削除されます"
+        confirm: "投稿への返信も削除してよろしいですか？"
+      disagree_and_restore:
+        title: "却下して投稿を復元"
+        description: "すべてのユーザーが閲覧できるように投稿を復元します。"
       disagree:
         title: "同意しない"
       ignore:
         title: "無視"
       approve:
         title: "承認"
+      approve_post:
+        title: "投稿の承認"
+        confirm_closed: "このトピックはクローズされました。それでも投稿を作成しますか？"
+      reject_post:
+        title: "投稿の拒否"
+      approve_user:
+        title: "ユーザーの承認"
       reject_user:
+        title: "ユーザーの削除…"
         delete:
           title: "ユーザーの削除"
+          description: "ユーザーはフォーラムから削除されます。"
+        block:
+          title: "ユーザーの削除とブロック"
+          description: "ユーザーは削除され、その IP とメールアドレスはブロックされます。"
       reject:
         title: "却下"
+        bundle_title: "拒否..."
+      reject_and_suspend:
+        title: "ユーザーの拒否と凍結"
+      reject_and_silence:
+        title: "ユーザーの拒否と投稿禁止"
+      reject_and_delete:
+        title: "投稿の拒否と削除"
+      reject_and_keep_deleted:
+        title: "投稿を削除されたままにする"
+      approve_and_restore:
+        title: "投稿の承認と復元"
+      delete_user:
+        reason: "レビューキューを介して削除されました"
+  email_style:
+    html_missing_placeholder: "html テンプレートには %{placeholder} が含まれている必要があります。"
+  notification_level:
+    ignore_error: "そのユーザーを無視できません。"
+    mute_error: "そのユーザーをミュートできません。"
+  discord:
+    not_in_allowed_guild: "認証に失敗しました。許可された Discord ギルドのメンバーではありません。"
+  old_keys_reminder:
+    title: "古い資格情報に関するリマインダー"
+    body: |
+      こんにちは！これは毎年定期的に Discourse インスタンスから送信されるセキュリティリマインダーです。
+
+      Discourse インスタンスで使用されている次の資格情報が 2 年以上更新されていないことをお知らせします。
+
+      %{keys}
+
+      現時点での対応は不要ですが、重要な資格情報は数年ごとに変更することが適切なセキュリティ実践であると考えられています。
+  create_linked_topic:
+    topic_title_with_sequence:
+      other: "%{topic_title} (パート %{count})"
+    post_raw: "%{parent_url} のディスカッションを継続中です。\n\n前のディスカッション:\n\n%{previous_topics}"
+    small_action_post_raw: "%{new_title} でディスカッションを続けます。"
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index 4f1fbcdae3..bb72e1c3fa 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -1543,11 +1543,6 @@ ko:
     discourse_connect_overrides_groups: "모든 수동 그룹 구성원을 그룹 속성에 지정된 그룹과 동기화합니다. (경고: 그룹을 지정하지 않으면 모든 수동 그룹 구성원이 지워짐)"
     auth_overrides_username: "로그인 할 때마다 외부 사이트의 사용자 이름으로  로컬 사용자 이름을 재정의하고 로컬 변경을 방지합니다. 모든 인증 공급자에 적용됩니다. (경고: 사용자 이름 길이/요구 사항의 차이로 인해 불일치가 발생할 수 있음)"
     auth_overrides_name: "로그인 할 때마다 사용자의 로컬 전체 이름을 무시하고 외부 사이트 전체 이름을 사용해 로컬 변경을 방지합니다. 모든 인증 공급자에 적용됩니다."
-    discourse_connect_overrides_avatar: "외부 DiscourseConnect 페이로드의 아바타로 사용자 아바타를 재정의합니다. 활성화되면 사용자는 Discourse에서 아바타를 업로드 할 수 없습니다."
-    discourse_connect_overrides_location: "DiscourseConnect 페이로드의 외부 위치로 사용자 위치를 재정의하고 로컬 변경을 방지합니다."
-    discourse_connect_overrides_website: "DiscourseConnect 페이로드의 외부 위치로 사용자 웹 사이트를 재정의하고 로컬 변경을 방지합니다."
-    discourse_connect_overrides_profile_background: "사용자 프로필 배경을 DiscourseConnect 페이로드의 외부 사이트 아바타로 재정의합니다."
-    discourse_connect_overrides_card_background: "DiscourseConnect 페이로드의 외부 사이트 아바타로 사용자 카드 배경을 재설정 합니다."
     discourse_connect_not_approved_url: "승인되지 않은 DiscourseConnect 계정을 이 URL로 리디렉션"
     discourse_connect_allows_all_return_paths: "DiscourseConnect에서 제공하는 return_paths에 대한 도메인을 제한하지 마십시오 (기본적으로 반환 경로는 현재 사이트에 있어야 함)."
     enable_local_logins: "로컬 사용자 아이디 및 암호 로그인 기반 계정을 활성화합니다. 경고: 비활성화 된 경우 이전에 하나 이상의 대체 로그인 방법을 구성하지 않은 경우 로그인하지 못할 수 있습니다."
@@ -1644,7 +1639,7 @@ ko:
     allow_staff_to_upload_any_file_in_pm: "관리자는 개인메시지에 파일 첨부를 허용합니다."
     strip_image_metadata: "스트립 이미지 메타 데이터."
     composer_media_optimization_image_enabled: "업로드된 이미지 파일의 클라이언트측 미디어 최적화를 활성화합니다."
-    composer_media_optimization_image_kilobytes_optimization_threshold: "클라이언트 측 최적화를 트리거하기 위한 최소 이미지 파일 크기"
+    composer_media_optimization_image_bytes_optimization_threshold: "클라이언트 측 최적화를 트리거하기 위한 최소 이미지 파일 크기"
     composer_media_optimization_image_resize_dimensions_threshold: "클라이언트측 크기 조정을 트리거하는 최소 이미지 너비"
     composer_media_optimization_image_resize_width_target: "너비가`composer_media_optimization_image_dimensions_resize_threshold`보다 큰 이미지는 이 너비로 크기가 조정됩니다. `composer_media_optimization_image_dimensions_resize_threshold`보다 크거나 같아야합니다."
     composer_media_optimization_image_encode_quality: "재 인코딩 프로세스에 사용되는 JPEG 인코딩 품질입니다."
@@ -2096,7 +2091,6 @@ ko:
     missing_secret: "시크릿이 없어 인증에 실패했습니다. 이 문제를 해결하려면 사이트 관리자에게 문의하십시오."
     invite_redeem_failed: "초대 사용에 실패했습니다. 사이트 관리자에게 문의하십시오."
   original_poster: "원본 게시자"
-  most_posts: "최대 게시자"
   most_recent_poster: "최근 게시자"
   frequent_poster: "빈번한 게시자"
   poster_description_joiner: ", "
@@ -2430,21 +2424,9 @@ ko:
   new_version_mailer:
     title: "새 버전 메일러"
     subject_template: "[%{email_prefix}] 새로운 담화 버전, 업데이트 가능"
-    text_body_template: |
-      [Discourse](https://www.discourse.org)의 새 버전이 출시되었습니다!
-
-      현재 버전: %{installed_version}
-      새 버전: **%{new_version}**
-
-      - 간편한 ** [원 클릭 브라우저 업그레이드](%{base_url}/admin/upgrade) **
-
-      - [출시 노트](https://meta.discourse.org/tag/release-notes) 또는 [raw GitHub 변경 로그](https://github.com/discourse/discourse/commits/master) 보기
-
-      - [meta.discourse.org](https://meta.discourse.org) 뉴스, 토론 및 Discourse 지원 살펴보기
   new_version_mailer_with_notes:
     title: "노트가있는 새로운 버전 메일러"
     subject_template: "[%{email_prefix}] 업데이트 가능"
-    text_body_template: "[Discourse](https://www.discourse.org)의 새 버전이 출시되었습니다!\n\n버전 : %{installed_version}\n새 버전 : **%{new_version}**\n\n- 간편한 **[원 클릭 브라우저 업그레이드](%{base_url}/admin/upgrade)**\n\n- [출시 노트]( https://meta.discourse.org/tag/release-notes) 또는 [raw GitHub 변경 로그](https://github.com/discourse/discourse/commits/master) 보기\n\n- Discourse에 대한 뉴스, 토론 및 지원을 위한 [meta.discourse.org](https://meta.discourse.org) 방문 \n\n### 릴리스 노트\n\n%{notes}\n"
   flag_reasons:
     off_topic: "내가 올린 글타래가 **주제 벗어난 이야기**으로 신고 되었습니다. 사람들이 이 글타래의 제목이랑 글 내용이 안 맞는다고 느끼나 봅니다. "
     inappropriate: "내가 올린 글타래가 **부적절**로 신고 되었습니다. 사람들이 이 글타래가 [가이드라인](%{base_path}/guidelines)에서 벗어나 공격적, 모욕적, 폭력적이라고 느낍니다."
@@ -3245,6 +3227,9 @@ ko:
         사용자님은 %{suspended_till}까지 사이트의 사용이 중지되었습니다.
 
         이유 - %{reason}
+    account_suspended_forever:
+      title: "계정 일시 중지"
+      subject_template: "[%{email_prefix}] 귀하의 계정이 정지되었습니다"
     account_silenced:
       title: "계정이 쓰기 금지됨"
       subject_template: "[%{email_prefix}] 사용자님의 계정이 쓰기 금지 되었습니다"
@@ -3252,6 +3237,9 @@ ko:
         사용자님은 %{silenced_till}까지 사이트내 글쓰기가 일시적으로 차단되었습니다.
 
         이유 - %{reason}
+    account_silenced_forever:
+      title: "계정이 쓰기 금지됨"
+      subject_template: "[%{email_prefix}] 사용자님의 계정이 쓰기 금지 되었습니다"
     account_exists:
       title: "계정이 이미 존재합니다"
       subject_template: "[%{email_prefix}] 계정이 이미 존재합니다"
diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml
index fa00f7ce51..0b078943fa 100644
--- a/config/locales/server.nb_NO.yml
+++ b/config/locales/server.nb_NO.yml
@@ -1063,7 +1063,6 @@ nb_NO:
       topic: "Resultater"
       user: "Brukere"
     results_page: "Søkeresultater for \"%{term}\""
-  most_posts: "Flest innlegg"
   most_recent_poster: "Ferskeste innlegg av"
   redirected_to_top_reasons:
     new_user: "Velkommen til felleskapet vårt! Dette er de mest populære emnene for tiden. "
@@ -1172,6 +1171,9 @@ nb_NO:
     account_suspended:
       title: "Konto sperret"
       subject_template: "[%{email_prefix}] Kontoen din er blitt sperret"
+    account_suspended_forever:
+      title: "Konto sperret"
+      subject_template: "[%{email_prefix}] Kontoen din er blitt sperret"
     digest:
       why: "Dette har skjedd på %{site_link} siden ditt forrige besøk %{last_seen_at}"
       since_last_visit: "Siden siste besøk"
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index e6f0ad48b1..a5171509bf 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -1961,7 +1961,6 @@ nl:
     blank_id_error: "De `external_id` is vereist, maar was leeg"
     email_error: "Er kon geen account met het e-mailadres <b>%{email}</b> worden geregistreerd. Neem contact op met de beheerder van de website."
   original_poster: "Oorspronkelijk geplaatst door"
-  most_posts: "Meer berichten"
   most_recent_poster: "Meest recente schrijver"
   frequent_poster: "Frequente schrijver"
   poster_description_joiner: ", "
@@ -2195,33 +2194,6 @@ nl:
     title: "Mailer Test"
   new_version_mailer:
     title: "Mailer Nieuwe versie"
-    text_body_template: |
-      Hoera, er is een nieuwe versie van [Discourse](https://www.discourse.org) beschikbaar!
-
-      Uw versie: %{installed_version}
-      Nieuwe versie: **%{new_version}**
-
-      - Upgrade via onze eenvoudige **[browserupgrade via één klik](%{base_url}/admin/upgrade)**
-
-      - Lees wat er nieuw is in de [uitgaveopmerkingen](https://meta.discourse.org/tag/release-notes), of bekijk de [groffe GitHub-changelog](https://github.com/discourse/discourse/commits/master)
-
-      - Bezoek [meta.discourse.org](https://meta.discourse.org) voor nieuws, discussie en ondersteuning voor Discourse
-  new_version_mailer_with_notes:
-    text_body_template: |
-      Hoera, er is een nieuwe versie van [Discourse](https://www.discourse.org) beschikbaar!
-
-      Uw versie: %{installed_version}
-      Nieuwe versie: **%{new_version}**
-
-      - Upgrade via onze eenvoudige **[browserupgrade via één klik](%{base_url}/admin/upgrade)**
-
-      - Lees wat er nieuw is in de [uitgaveopmerkingen](https://meta.discourse.org/tag/release-notes), of bekijk de [groffe GitHub-changelog](https://github.com/discourse/discourse/commits/master)
-
-      - Bezoek [meta.discourse.org](https://meta.discourse.org) voor nieuws, discussie en ondersteuning voor Discourse
-
-      ### Uitgaveopmerkingen
-
-      %{notes}
   flag_reasons:
     off_topic: "Uw bericht is gemarkeerd als **off-topic**: de gemeenschap vindt dat het niet goed bij het topic past, zoals momenteel bepaald door de titel en het eerste bericht."
     inappropriate: "Uw bericht is gemarkeerd als **ongepast**: de gemeenschap vindt het bericht beledigend, grof, of een schending van [onze gemeenschapsrichtlijnen](%{base_path}/guidelines)."
@@ -2534,9 +2506,15 @@ nl:
     account_suspended:
       title: "Account geschorst"
       subject_template: "[%{email_prefix}] Uw account is geschorst"
+    account_suspended_forever:
+      title: "Account geschorst"
+      subject_template: "[%{email_prefix}] Uw account is geschorst"
     account_silenced:
       title: "Account gedempt"
       subject_template: "[%{email_prefix}] Uw account is gedempt"
+    account_silenced_forever:
+      title: "Account gedempt"
+      subject_template: "[%{email_prefix}] Uw account is gedempt"
     account_exists:
       title: "Account bestaat al"
     digest:
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index 3536dfadf5..636d321444 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -103,6 +103,12 @@ pl_PL:
       maximum_staged_user_per_email_reached: "Osiągnięto maksymalną ilość użytkowników etapowych zarejestrowanych przez email."
       no_subject: "(brak tematu)"
       no_body: "(brak treści wpisu)"
+      missing_attachment: "(Brakuje załącznika %{filename})"
+      continuing_old_discussion:
+        one: "Kontynuacja dyskusji z [%{title}](%{url}), ponieważ została utworzona ponad %{count} dzień temu."
+        few: "Kontynuacja dyskusji z [%{title}](%{url}), ponieważ została utworzona ponad %{count} dni temu."
+        many: "Kontynuacja dyskusji z [%{title}](%{url}), ponieważ została utworzona ponad %{count} dni temu."
+        other: "Kontynuacja dyskusji z [%{title}](%{url}), ponieważ została utworzona ponad %{count} dni temu."
       errors:
         empty_email_error: "Zdarza się kiedy e-mail jaki dostaliśmy jest pusty."
         no_message_id_error: "Zdarza się kiedy email nie posiada nagłówka 'Message-Id'."
@@ -240,11 +246,17 @@ pl_PL:
     user_exists: "Nie ma potrzeby zapraszania <b>%{email}</b>, <a href='%{base_path}/u/%{username}/summary'>obecnie posiada konto!</a>"
     invite_exists: "Zaprosiłeś już <b>%{email}</b>."
     invalid_email: "%{email} nie jest prawidłowym adresem e-mail."
+    rate_limit:
+      one: "Wysłałeś już %{count} zaproszenie w ostatnim dniu, odczekaj %{time_left} zanim spróbujesz ponownie."
+      few: "Wysłałeś już %{count} zaproszenia w ostatnim dniu, odczekaj %{time_left} zanim spróbujesz ponownie."
+      many: "Wysłałeś już %{count} zaproszeń w ostatnim dniu, odczekaj %{time_left} zanim spróbujesz ponownie."
+      other: "Wysłałeś już %{count} zaproszeń w ostatnim dniu, odczekaj %{time_left} zanim spróbujesz ponownie."
     confirm_email: "<p>Już prawie koniec! Wysłaliśmy na Twój adres e-mail aktywacyjny. Postępuj zgodnie z instrukcjami w e-mailu, aby aktywować konto.</p><p>Jeśli e-mail nie przyszedł, sprawdź folder ze spamem.</p>"
     cant_invite_to_group: "Nie możesz zapraszać użytkowników do określonej grupy. Upewnij się, że jesteś właścicielem grupy, do których próbujesz zaprosić."
     disabled_errors:
       discourse_connect_enabled: "Zaproszenia są wyłączone, ponieważ DiscourseConnect jest włączony."
       invalid_access: "Nie masz uprawnień do przeglądania żądanego zasobu."
+    requires_groups: "Zaproszenie zapisane. Aby dać dostęp do określonego tematu, dodaj jedną z następujących grup: %{groups}."
   bulk_invite:
     file_should_be_csv: "Wgrywany plik powinien być formatu csv."
     max_rows: "Wysłano %{max_bulk_invites} pierwszych zaproszeń. Sprobuj podzielić plik na mniejsze części."
@@ -1008,8 +1020,13 @@ pl_PL:
     imap_authentication_error: "Wystąpił problem z podanymi poświadczeniami IMAP, sprawdź nazwę użytkownika i hasło i spróbuj ponownie."
     imap_no_response_error: "Wystąpił błąd podczas komunikacji z serwerem IMAP. %{message}"
     smtp_authentication_error: "Wystąpił problem z podanymi poświadczeniami SMTP, sprawdź nazwę użytkownika i hasło i spróbuj ponownie."
+    authentication_error_gmail_app_password: 'Wymagane hasło aplikacji. Dowiedz się więcej czytając <a target="_blank" href="https://support.google.com/accounts/answer/185833">ten artykuł pomocy Google</a>'
     smtp_server_busy_error: "Serwer SMTP jest obecnie zajęty, spróbuj ponownie później."
     smtp_unhandled_error: "Wystąpił nieobsługiwany błąd podczas komunikacji z serwerem SMTP. %{message}"
+    imap_unhandled_error: "Podczas komunikacji z serwerem IMAP wystąpił nieobsługiwany błąd. %{message}"
+    connection_error: "Wystąpił problem z połączeniem z serwerem, sprawdź nazwę i port serwera i spróbuj ponownie."
+    timeout_error: "Przekroczono limit czasu połączenia z serwerem, sprawdź nazwę i port serwera i spróbuj ponownie."
+    unhandled_error: "Nieobsługiwany błąd podczas testowania ustawień poczty e-mail. %{message}"
   webauthn:
     validation:
       invalid_type_error: "Podany typ webauthn był nieprawidłowy. Prawidłowe typy to webauthn.get i webauthn.create."
@@ -1465,6 +1482,7 @@ pl_PL:
     force_https_warning: "Twoja strona korzysta z SSL. Ale `<a href='%{base_path}/admin/site_settings/category/all_results?filter=force_https'>force_https</a>` nie jest jeszcze włączone w ustawieniach strony."
     out_of_date_themes: "Aktualizacje są dostępne dla następujących motywów:"
     unreachable_themes: "Nie byliśmy w stanie sprawdzić aktualizacji następujących tematów:"
+    watched_word_regexp_error: "Wyrażenie regularne dla '%{action}' jest nieprawidłowe. Sprawdź ustawienia <a href='%{base_path}/admin/customize/watched_words'>obserwowanych słów</a> lub wyłącz ustawienie witryny „obserwowane słowa regularne”."
   site_settings:
     display_local_time_in_user_card: "Wyświetl czas lokalny w oparciu o strefę czasową użytkownika po otwarciu karty użytkownika."
     censored_words: "Wskazane słowa będą automatycznie zamieniane na &#9632;&#9632;&#9632;&#9632;"
@@ -1496,11 +1514,13 @@ pl_PL:
     category_search_priority_high_weight: "Waga zastosowana w rankingu dla priorytetu wyszukiwania wysokiej kategorii."
     allow_uncategorized_topics: "Zezwól na tworzenie tematów bez kategorii. UWAGA: jeśli jest jakiś nieskategoryzowany temat, musisz go przypisać do kategorii, zanim wyłączysz tę opcję."
     allow_duplicate_topic_titles: "Pozwól na tworzenie tematów o identycznych tytułach."
+    allow_duplicate_topic_titles_category: "Zezwalaj na tematy z identycznymi, zduplikowanymi tytułami, jeśli kategoria jest inna. allow_duplicate_topic_titles musi być wyłączone."
     unique_posts_mins: "Ile minut musi upłynąć zanim użytkownik będzie mógł/mogła ponownie zrobić wpis z tą samą treścią"
     educate_until_posts: "Wyświetlaj okno edukacyjne po rozpoczęciu pisania dopóki nowy użytkownik nie napisze tylu wpisów."
     title: "Nazwa tej strony używana w tagu title."
     site_description: "Opis strony w jednym zdaniu, wykorzystywany w meta tagu description."
     short_site_description: "Krótki opis, użyty w tytule na stronie głównej."
+    contact_email: "Adres e-mail do kluczowego kontaktu do osoby odpowiedzialnej za tę witrynę. Używany do krytycznych powiadomień, a także wyświetlany na <a href='%{base_path}/about' target='_blank'>/about</a> w pilnych sprawach."
     contact_url: "Adres URL kontaktu dla tej witryny. Wyświetlany na stronie <a href='%{base_path}/about' target='_blank'>/about</a> dla pilnych spraw."
     crawl_images: "Pobieraj grafiki ze zdalnych URLi aby ustawić poprawną wysokość i szerokość w tagu img."
     download_remote_images_to_local: "Pobieraj zdalne grafiki i twórz ich lokalne kopie aby zapobiegać uszkodzonym/brakującym obrazkom na stronach."
@@ -1576,6 +1596,9 @@ pl_PL:
     tl2_additional_likes_per_day_multiplier: "Zwiększ limit polubień na dzień dla tl2 (członek), mnożąc przez tę liczbę"
     tl3_additional_likes_per_day_multiplier: "Zwiększ limit polubień na dzień dla tl3 (użytkownik stały), mnożąc przez tę liczbę"
     tl4_additional_likes_per_day_multiplier: "Zwiększ limit polubień na dzień dla tl4 (lider), mnożąc przez tę liczbę"
+    tl2_additional_edits_per_day_multiplier: "Zwiększ limit dziennych edycji dla tl2 (członek) przez pomnożenie przez tę liczbę"
+    tl3_additional_edits_per_day_multiplier: "Zwiększ limit dziennych edycji dla tl3 (regularny) przez pomnożenie przez tę liczbę"
+    tl4_additional_edits_per_day_multiplier: "Zwiększ limit dziennych edycji dla tl4 (lider) przez pomnożenie przez tę liczbę"
     num_users_to_silence_new_user: "Jeśli wpisy nowego użytkownika otrzymają znaczniki spamu num_spam_flags_to_silence_new_user od wielu różnych użytkowników, ukryj wszystkie ich wpisy i zapobiegaj publikowaniu w przyszłości. 0, aby wyłączyć."
     num_tl3_flags_to_silence_new_user: "Jeśli wpisy nowego użytkownika otrzymają tyle flag od num_tl3_users_to_silence_new_user różnych użytkowników poziomu zaufania 3, ukryj wszystkie ich wpisy i zapobiegaj publikowaniu w przyszłości. 0, aby wyłączyć."
     num_tl3_users_to_silence_new_user: "Jeśli wpisy nowego użytkownika otrzymają flagi num_tl3_flags_to_silence_new_user od wielu różnych użytkowników poziomu zaufania 3, ukryj wszystkie ich wpisy i zapobiegaj publikowaniu w przyszłości. 0, aby wyłączyć."
@@ -1591,6 +1614,7 @@ pl_PL:
     invite_code: "Użytkownik musi wpisać ten kod, aby zezwolić na rejestrację konta, ignorowany, gdy jest pusty (bez rozróżniania wielkości liter)"
     approve_suspect_users: "Dodaj podejrzanych użytkowników do kolejki recenzji. Podejrzani użytkownicy weszli do biografii / witryny, ale nie czytali."
     review_every_post: "Wszystkie posty muszą zostać sprawdzone. OSTRZEŻENIE! NIE ZALECA SIĘ DLA RUCHLIWYCH WITRYN."
+    pending_users_reminder_delay_minutes: "Powiadom moderatorów, jeśli nowi użytkownicy czekają na zatwierdzenie dłużej niż tyle minut. Ustaw na -1, aby wyłączyć powiadomienia."
     persistent_sessions: "Użytkownicy pozostaną zalogowani po zamknięciu przeglądarki internetowej"
     maximum_session_age: "Użytkownik zostanie zalogowany przez n godzin od czasu ostatniej wizyty."
     ga_version: "Wersja Google Universal Analytics do użycia: v3 (analytics.js), v4 (gtag)"
@@ -1600,6 +1624,7 @@ pl_PL:
     gtm_container_id: "Identyfikator menedżera tagów Google. np .: GTM-ABCDEF. <br/>Uwaga: skrypty innych firm ładowane przez GTM mogą wymagać uwzględnienia w 'content security policy script src'."
     enable_escaped_fragments: "Wróć do Google Ajax-Crawling API, jeśli nie zostanie wykryty żaden webcrawler. Zobacz <a href='https://developers.google.com/webmasters/ajax-crawling/docs/learn-more' target='_blank'>https://developers.google.com/webmasters/ajax-crawling/docs/learn-more</a>"
     moderators_manage_categories_and_groups: "Pozwól moderatorom zarządzać kategoriami i grupami"
+    moderators_change_post_ownership: "Zezwalaj moderatorom na zmianę właściciela posta"
     cors_origins: "Dozwolone źródła dla zapytać cross-origin (CORS). Każde źródło musi zawierać http:// lub https://. Zmienna środowiskowa DISCOURSE_ENABLE_CORS musi być ustawiona na true żeby włączyć CORS."
     use_admin_ip_allowlist: "Administratorzy mogą się zalogować tylko wtedy, gdy używają adresu IP zdefiniowanego na liście ekranowanych adresów IP (Administrator > Logi > Ekranowane adresy IP)."
     blocked_ip_blocks: "Lista prywatnych bloków IP, które nigdy nie powinny być indeksowane przez Discourse"
@@ -1640,6 +1665,7 @@ pl_PL:
     send_old_credential_reminder_days: "Przypomnij o starych danych logowania po dniach"
     email_token_valid_hours: "Tokeny resetujące hasło / aktywujące konto są ważne przez (n) godzin."
     enable_badges: "Włącz system odznak"
+    max_favorite_badges: "Maksymalna liczba odznak, które użytkownik może wybrać"
     enable_whispers: "Pozwalaj administracji na prywatną rozmowę w tematach."
     allow_index_in_robots_txt: "W pliku robots.txt określ, że ta witryna może być indeksowana przez wyszukiwarki internetowe. W wyjątkowych przypadkach możesz trwale <a href='%{base_path}/admin/customize/robots'>zastąpić plik robots.txt</a>."
     blocked_email_domains: "Lista domen poczty e-mail rozdzielonych pionową kreską, z których użytkownicy nie mogą rejestrować kont. Przykład: mailinator.com|trashmail.net"
@@ -1668,15 +1694,17 @@ pl_PL:
     enable_discourse_connect_provider: "Wdrożenie protokołu dostawcy DiscourseConnect (dawniej 'Discourse SSO') w punkcie końcowym /session/sso_provider, który wymaga ustawienia discourse_connect_provider_secrets"
     discourse_connect_url: "Adres URL punktu końcowego DiscourseConnect (musi zawierać http:// lub https://)"
     discourse_connect_secret: "Sekretny ciąg znaków używany do uwierzytelniania kryptograficznego informacji DiscourseConnect, upewnij się, że ma 10 lub więcej znaków"
+    discourse_connect_provider_secrets: "Lista tajnych domen korzystających z DiscourseConnect. Upewnij się, że ma co najmniej 10 znaków. Symbol gwiazdki może być użyty do dopasowania dowolnej domeny lub części domeny (przykład: * .example.com)"
     discourse_connect_overrides_bio: "Zastępuje biografię użytkownika w profilu użytkownika i uniemożliwia jej zmianę"
     discourse_connect_overrides_groups: "Synchronizuj wszystkie ręczne członkostwo w grupie z grupami określonymi w atrybucie grup (OSTRZEŻENIE: jeśli nie określisz grup, wszystkie ręczne członkostwo w grupie zostanie wyczyszczone dla użytkownika)"
+    auth_overrides_email: "Nadpisuje lokalny e-mail przez adres e-mail zewnętrznej witryny przy każdym logowaniu i zapobiega lokalnym zmianom. Stosuje się do wszystkich dostawców uwierzytelniania. (WARNING: mogą wystąpić rozbieżności w wyniku normalizacji lokalnych adresów e-mail)"
     auth_overrides_username: "Zastępuje lokalną nazwę użytkownika nazwą użytkownika witryny zewnętrznej przy każdym logowaniu i zapobiega lokalnym zmianom. Dotyczy wszystkich dostawców uwierzytelniania. (OSTRZEŻENIE: mogą wystąpić rozbieżności ze względu na różnice w długości/wytycznych nazwy użytkownika)"
     auth_overrides_name: "Zastępuje pełną nazwę lokalną pełną nazwą witryny zewnętrznej przy każdym logowaniu i zapobiega zmianom lokalnym. Dotyczy wszystkich dostawców uwierzytelniania."
-    discourse_connect_overrides_avatar: "Zastępuje awatar użytkownika awatarem witryny zewnętrznej z zapytania DiscourseConnect. Jeśli ta opcja jest włączona, użytkownicy nie będą mogli przesyłać awatarów na Discourse."
-    discourse_connect_overrides_location: "Zastępuje lokalizację użytkownika lokalizacją zewnętrzną z zapytania DiscourseConnect i zapobiega zmianom lokalnym."
-    discourse_connect_overrides_website: "Zastępuje witrynę użytkownika zewnętrzną lokalizacją z zapytania DiscourseConnect i zapobiega zmianom lokalnym."
-    discourse_connect_overrides_profile_background: "Zastępuje tło profilu użytkownika awatarem witryny zewnętrznej z zapytania DiscourseConnect."
-    discourse_connect_overrides_card_background: "Zastępuje tło karty użytkownika awatarem witryny zewnętrznej z zapytania DiscourseConnect."
+    discourse_connect_overrides_avatar: "Zastępuje awatar użytkownika wartością z DiscourseConnect. Jeśli ta opcja jest włączona, użytkownicy nie będą mogli przesyłać awatarów do Discourse."
+    discourse_connect_overrides_location: "Zastępuje lokalizację użytkownika wartością z DiscourseConnect i zapobiega lokalnym zmianom."
+    discourse_connect_overrides_website: "Zastępuje witrynę użytkownika wartością z DiscourseConnect i zapobiega lokalnym zmianom."
+    discourse_connect_overrides_profile_background: "Zastępuje tło profilu użytkownika wartością z DiscourseConnect."
+    discourse_connect_overrides_card_background: "Zastępuje tło karty użytkownika wartością z DiscourseConnect."
     discourse_connect_not_approved_url: "Przekieruj niezatwierdzone konta DiscourseConnect do tego adresu URL"
     discourse_connect_allows_all_return_paths: "Nie ograniczaj domeny do return_paths dostarczanych przez DiscourseConnect (domyślnie ścieżka zwrotna musi znajdować się w bieżącej witrynie)"
     enable_local_logins: "Włącz konta oparte na loginach lokalnych i hasłach. OSTRZEŻENIE: jeśli opcja jest wyłączona, zalogowanie się może nie być możliwe, jeśli wcześniej nie skonfigurowano co najmniej jednej alternatywnej metody logowania."
@@ -1702,6 +1730,7 @@ pl_PL:
     discord_secret: "Sekretny klucz Discorda"
     discord_trusted_guilds: 'Zezwalaj tylko członkom tych gildii Discorda na logowanie się przez Discord. Użyj numerycznego identyfikatora gildii. Aby uzyskać więcej informacji, zapoznaj się z instrukcjami zamieszczonymi <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">tutaj</a>. Pozostaw puste, aby pozwolić na dołączenie z dowolnej gildii.'
     enable_backups: "Pozwól administratorom tworzyć kopie zapasowe forum"
+    allow_restore: "Zezwól na przywracanie, które może zastąpić WSZYSTKIE dane witryny! Pozostaw wyłączone, chyba że planujesz przywrócić kopię zapasową"
     maximum_backups: "Maksymalna liczba kopii zapasowych do przechowywania na dysku. Starsze kopie zapasowe zostaną automatycznie usunięte."
     automatic_backups_enabled: "Uruchom automatyczne kopie zapasowe zgodnie z ustawioną częstotliwością kopii"
     backup_frequency: "Liczba dni pomiędzy tworzeniem kopii zapasowych."
@@ -1773,7 +1802,7 @@ pl_PL:
     allow_staff_to_upload_any_file_in_pm: "Pozwól personelowi przesyłać pliki w wiadomościach."
     strip_image_metadata: "Pasek metadanych obrazu."
     composer_media_optimization_image_enabled: "Umożliwia optymalizację przesyłanych plików graficznych po stronie klienta."
-    composer_media_optimization_image_kilobytes_optimization_threshold: "Minimalny rozmiar pliku obrazu do uruchomienia optymalizacji po stronie klienta"
+    composer_media_optimization_image_bytes_optimization_threshold: "Minimalny rozmiar pliku obrazu do uruchomienia optymalizacji po stronie klienta"
     composer_media_optimization_image_resize_dimensions_threshold: "Minimalna szerokość obrazu, aby wywołać zmianę rozmiaru po stronie klienta"
     composer_media_optimization_image_resize_width_target: "Obrazy o szerokości większej niż `composer_media_optimization_image_dimensions_resize_threshold` zostaną przeskalowane do tej szerokości. Musi być >= niż `composer_media_optimization_image_dimensions_resize_threshold`."
     composer_media_optimization_image_encode_quality: "Jakość kodowania JPEG używana w procesie ponownego kodowania."
@@ -1889,9 +1918,11 @@ pl_PL:
     min_first_post_typing_time: "Minimalny czas w milisekundach, w którym użytkownik musi napisać wpis, jeśli próg nie zostanie osiągnięty wpis zostanie automatycznie dostosowany w zależności od kolejki zatwierdzania potrzeb. Ustaw 0, aby wyłączyć (nie polecane)"
     auto_silence_fast_typers_on_first_post: "Automatycznie wyciszaj użytkowników, którzy nie dotrzymują czasu_pierwszego_poczęcia"
     auto_silence_fast_typers_max_trust_level: "Maksymalny poziom zaufania do automatycznego wyciszania szybkich maszyn do pisania"
+    auto_silence_first_post_regex: "Wyrażenie regularne bez uwzględniania wielkości liter, które jeśli zostanie przekazane, spowoduje wyciszenie pierwszego posta użytkownika i wysłanie go do kolejki zatwierdzenia. Przykład: raging|a[bc]a , spowoduje, że wszystkie posty zawierające raging lub aba lub aca zostaną najpierw wyciszone. Dotyczy tylko pierwszego postu. PRZESTARZAŁE: Zamiast tego używaj Silence Watched Words."
     reviewable_claiming: "Czy należy przejrzeć treść, którą można przeglądać, zanim będzie można z niej skorzystać?"
     reviewable_default_topics: "Domyślnie wyświetlaj zawartość do przeglądania pogrupowaną według tematów"
     reviewable_default_visibility: "Nie pokazuj elementów, które można przeglądać, chyba że spełniają ten priorytet"
+    reviewable_low_priority_threshold: "Filtr priorytetu ukrywa sprawdzalne elementy, które nie spełniają tego wyniku, chyba że zostanie użyty filtr „(dowolny)”."
     high_trust_flaggers_auto_hide_posts: "Nowe wpisy użytkowników są automatycznie ukryte po oznaczeniu ich jako spam przez użytkownika TL3 +"
     cooldown_hours_until_reflag: "Ile czasu użytkownicy będą musieli poczekać, aż będą mogli zmienić etykietę wpisu"
     slow_mode_prevents_editing: "Czy 'Tryb zwolniony' uniemożliwia edycję, po editing_grace_period?"
@@ -1925,6 +1956,7 @@ pl_PL:
     always_show_trimmed_content: "Zawsze pokazuj przyciętą część przychodzących e-maili. UWAGA: może ujawniać adresy e-mail."
     trim_incoming_emails: "Przytnij część przychodzących e-maili, które nie są istotne."
     private_email: "Nie umieszczaj treści z wpisów lub tematów w tytule lub treści e-maila. UWAGA: wyłącza także przetrawianie wiadomości e-mail."
+    email_total_attachment_size_limit_kb: "Maksymalny łączny rozmiar plików dołączanych do wychodzących e-maili w kB. Ustaw na 0, aby wyłączyć wysyłanie załączników."
     post_excerpts_in_emails: "W wiadomościach e-mail zawsze wysyłaj fragmenty zamiast pełnych wpisów"
     raw_email_max_length: "Ile znaków należy przechowywać dla przychodzących wiadomości e-mail."
     raw_rejected_email_max_length: "Ile znaków należy przechowywać dla odrzuconego przychodzącego e-maila."
@@ -2049,6 +2081,7 @@ pl_PL:
     notify_about_flags_after: "Jeśli istnieją flagi, które nie zostały sprawdzone po tylu godzinach, wyślij osobistą wiadomość do moderatorów. Ustaw na 0, aby wyłączyć."
     show_create_topics_notice: "Jeśli na stronie jest mniej niż 5 publicznych tematów, pokaż powiadomienie proszące adminów, aby stworzyli nowe tematy."
     delete_drafts_older_than_n_days: "Usuń projekty starsze niż (n) dni."
+    delete_merged_stub_topics_after_days: "Liczba dni, po których wątki, z których zostały przeniesione wszystkie posty, zostaną automatycznie usunięte. Aby to wyłączyć, ustaw wartość na 0."
     bootstrap_mode_min_users: "Minimalna liczba użytkowników potrzebnych do wyłączenia trybu rozruchowego (ustaw 0, aby wyłączyć)"
     prevent_anons_from_downloading_files: "Zablokuj możliwość pobierania załączników przez anonimowych użytkowników."
     secure_media: 'Ogranicza dostęp do WSZYSTKICH przesłanych plików (obrazów, wideo, audio, tekstu, plików PDF, zip i innych). Jeśli opcja „wymagane logowanie” jest włączona, tylko zalogowani użytkownicy mają dostęp do przesyłanych plików. W przeciwnym razie dostęp będzie ograniczony tylko do przesłanych multimediów w wiadomościach prywatnych i kategoriach prywatnych. OSTRZEŻENIE: to ustawienie jest złożone i wymaga głębokiego zrozumienia administracyjnego. Zobacz <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">ten artykuł</a>, aby dowiedzieć się więcej.'
@@ -2154,6 +2187,7 @@ pl_PL:
     share_quote_buttons: "Określ, które elementy pojawiają się w widżecie udostępniania cytatów i w jakiej kolejności."
     share_quote_visibility: "Określ, kiedy wyświetlać przyciski udostępniania cytatów: nigdy, tylko anonimowym użytkownikom lub wszystkim użytkownikom. "
     create_revision_on_bulk_topic_moves: "Utwórz rewizję dla pierwszych postów, gdy tematy zostaną przeniesione do nowej kategorii zbiorczo."
+    allow_changing_staged_user_tracking: "Zezwalaj na zmianę preferencji powiadomień o kategoriach i tagach użytkownika etapowego przez administratora."
     errors:
       invalid_email: "Nieprawidłowy adres e-mail."
       invalid_username: "Użytkownik o takiej nazwie nie istnieje."
@@ -2225,7 +2259,6 @@ pl_PL:
     missing_secret: "Uwierzytelnianie nie powiodło się z powodu braku sekretnego klucza. Skontaktuj się z administratorami, aby rozwiązać ten problem."
     invite_redeem_failed: "Zaproszenie nie powiodło się. Skontaktuj się z administratorem serwisu."
   original_poster: "Autor pierwszego wpisu"
-  most_posts: "Większość wpisów"
   most_recent_poster: "Autor najnowszego wpisu"
   frequent_poster: "Aktywny uczestnik"
   poster_description_joiner: ", "
@@ -2366,6 +2399,7 @@ pl_PL:
     reset_not_allowed_from_ip_address: "Nie możesz zażądać resetowania hasła z tego adresu IP."
     suspended: "Nie możesz się zalogować aż do %{date}."
     suspended_with_reason: "Konto zawieszone do %{date}: %{reason}"
+    suspended_with_reason_forever: "Konto zawieszone: %{reason}"
     errors: "%{errors}"
     not_available: "Niedostępny. Może spróbuj %{suggestion}?"
     something_already_taken: "Coś poszło źle. Możliwe, że ta nazwa użytkownika lub email są już zarejestrowane. Spróbuj użyć procedury przypominania hasła."
@@ -2636,7 +2670,7 @@ pl_PL:
 
       - Uaktualnij za pomocą naszego prostego **[uaktualnienia przez przeglądarkę jednym kliknięciem](%{base_url}/admin/upgrade)**
 
-      - Zobacz, co nowego w [dzienniku zmian](https://meta.discourse.org/tag/release-notes) lub przejrzyj [nieprzetworzony dziennik zmian GitHub](https://github.com/discourse/discourse/commits/master)
+      - Zobacz, co nowego w [dzienniku zmian](https://meta.discourse.org/tag/release-notes) lub przejrzyj [nieprzetworzony dziennik zmian GitHub](https://github.com/discourse/discourse/commits/main)
 
       - Odwiedź [meta.discourse.org](https://meta.discourse.org) dla nowości, dyskusji i wsparcia technicznego dla Discourse
   new_version_mailer_with_notes:
@@ -2650,7 +2684,7 @@ pl_PL:
 
       - Uaktualnij za pomocą naszego prostego **[uaktualnienia przez przeglądarkę jednym kliknięciem](%{base_url}/admin/upgrade)**
 
-      - Zobacz, co nowego w [dzienniku zmian](https://meta.discourse.org/tag/release-notes) lub przejrzyj [nieprzetworzony dziennik zmian GitHub](https://github.com/discourse/discourse/commits/master)
+      - Zobacz, co nowego w [dzienniku zmian](https://meta.discourse.org/tag/release-notes) lub przejrzyj [nieprzetworzony dziennik zmian GitHub](https://github.com/discourse/discourse/commits/main)
 
       - Odwiedź [meta.discourse.org](https://meta.discourse.org) dla nowości, dyskusji i wsparcia technicznego dla Discourse
 
@@ -3241,6 +3275,7 @@ pl_PL:
   subject_re: "Re: "
   subject_pm: "[PW] "
   email_from: "%{user_name} z %{site_name}"
+  email_from_without_site: "%{user_name}"
   user_notifications:
     previous_discussion: "Poprzednie odpowiedzi"
     reached_limit:
@@ -3461,6 +3496,13 @@ pl_PL:
       text_body_template: |
         Zostałeś zawieszony na forum do %{suspended_till}.
 
+        Powód - %{reason}
+    account_suspended_forever:
+      title: "Konto zawieszone"
+      subject_template: "[%{email_prefix}] Twoje konto zostało zawieszone"
+      text_body_template: |
+        Zostałeś zawieszony na forum.
+
         Powód - %{reason}
     account_silenced:
       title: "Konto uciszone"
@@ -3468,6 +3510,13 @@ pl_PL:
       text_body_template: |
         Zostałeś wyciszony na forum do %{silenced_till}.
 
+        Powód - %{reason}
+    account_silenced_forever:
+      title: "Konto uciszone"
+      subject_template: "[%{email_prefix}] Twoje konto zostało wyciszone"
+      text_body_template: |
+        Zostałeś uciszony na forum.
+
         Powód - %{reason}
     account_exists:
       title: "Konto już istnieje"
@@ -3783,6 +3832,103 @@ pl_PL:
     Edytuj pierwszy wpis w tym temacie by zmienić zawartość strony %{page_name}.
   guidelines_topic:
     title: "FAQ/Przewodnik"
+    body: |
+      <a name="civilized"></a>
+
+      ## [To cywilizowane miejsce do publicznej dyskusji](#civilized)
+
+      Traktuj to forum dyskusyjne z takim samym szacunkiem jak miejsce publiczne. To platforma dyskusyjna - miejsce, w którym poprzez stałą komunikację możesz dzielić się umiejętnościami, wiedzą i zainteresowaniami.
+
+      To nie są sztywne i szybkie zasady, to tylko wskazówki, aby odwiedzający mieli pozytywną opinię o naszej społeczności. Postaraj się postępować zgodnie z tymi zaleceniami, aby to forum zawsze pozostawało ciekawą i pouczającą platformą dla cywilizowanych dyskusji publicznych.
+
+      <a name="improve"></a>
+
+      ## [Ulepsz dyskusje](#improve)
+
+      Pomóż nam uczynić to forum atrakcyjnym miejscem wymiany poglądów, pracując nad poprawą dyskusji, nawet od czasu do czasu. Jeśli nie masz pewności, czy Twoja wiadomość wnosi coś przydatnego do rozmowy, zastanów się jeszcze raz nad tym, co chcesz powiedzieć i spróbuj ponownie później.
+
+      Jednym ze sposobów usprawnienia dyskusji jest odkrycie tych, które się już zdarzyły. Poświęć czas na przeglądanie tematów tutaj, zanim odpowiesz lub zaczniesz tworzyć własne, a będziesz mieć większą szansę na poznanie innych osób, które podzielają Twoje zainteresowania.
+
+      Tematy tutaj omawiane są dla nas ważne i chcemy, abyś działał tak, jakby były one również dla ważne Ciebie. Szanuj tematy i osoby, które je omawiają, nawet jeśli nie zgadzasz się z częścią tego, co zostało powiedziane.
+
+      <a name="agreeable"></a>
+
+      ## [Bądź miły, nawet jeśli się nie zgadzasz](#agreeable)
+
+      Możesz odpowiedzieć, nie zgadzając się. W porządku. Ale pamiętaj, aby _krytykować pomysły, a nie ludzi_. Staraj się unikać:
+
+      * Wyzwisk
+      * Odpowiadania na ton postu zamiast na jego rzeczywistą treść
+      * Reakcji wywoływanych przez emocje
+
+      Zamiast tego przedstaw przemyślane spostrzeżenia, które poprawią dyskusje.
+
+      <a name="participate"></a>
+
+      ## [Twój udział się liczy](#participate)
+
+      Pytania zadawane na forum nadają ogólny ton dyskusji. Pomóż nam kształtować przyszłość tej społeczności, uczestnicząc w dyskusjach, które czynią to forum bardziej interesującym i unikając dyskusji, które Twoim zdaniem nie są tego warte.
+
+      Discourse zapewnia narzędzia, które pozwalają społeczności wspólnie określać najlepszy (i najgorszy) wkład: ulubione, zakładki, polubienia, skargi, odpowiedzi, historię zmian i wiele innych. Użyj tego zestawu narzędzi, aby wzbogacić zarówno swoje doświadczenie, jak i doświadczenia innych.
+
+      Sprawmy, aby to forum było lepsze niż zastałeś je wcześniej.
+
+      <a name="flag-problems"></a>
+
+      ## [Jeśli widzisz problem, zgłoś go](#flag-problems)
+
+      Moderatorzy mają specjalne uprawnienia; są odpowiedzialni za to forum. Ale ty też. Z Twoją pomocą moderatorzy mogą być mediatorami społeczności, a nie tylko dozorcami czy policją.
+
+      Kiedy widzisz złe zachowanie, nie odpowiadaj. Odpowiadanie na takie wpisy zachęca do złego zachowania, uznając je, zużywa energię i marnuje czas wszystkich. _Wystarczy to zgłosić_. Jeśli pojawi się wystarczająca liczba flag, działania zostaną podjęte automatycznie lub przez interwencję moderatora.
+
+      W celu utrzymania naszej społeczności moderatorzy zastrzegają sobie prawo do usunięcia wszelkich treści i dowolnego konta użytkownika z dowolnego powodu w dowolnym momencie. Moderatorzy nie przeglądają nowych postów; moderatorzy i operatorzy witryn nie ponoszą odpowiedzialności za treści publikowane przez społeczność.
+
+      <a name="be-civil"></a>
+
+      ## [Bądź uprzejmy](#be-civil)
+
+      Nic tak nie sabotuje zdrowej rozmowy jak niegrzeczność:
+
+      * Bądź uprzejmy. Nie publikuj niczego, co rozsądna osoba uznałaby za obraźliwe, obraźliwe lub nienawistne.
+      * Przestrzegaj przyzwoitości. Nie publikuj niczego nieprzyzwoitego lub erotycznego.
+      * Szanujmy się nawzajem. Nie poniżaj rozmówców, nie denerwuj, nie podszywaj się pod kogoś innego i nie ujawniaj danych osobowych innych użytkowników.
+      * Szanuj forum. Nie wysyłaj spamu ani innych niepotrzebnych wiadomości.
+
+      Nie mówimy o żadnych konkretnych terminach - unikaj zamieszczania takich informacji. Jeśli nie masz pewności co do jakości publikacji, zadaj sobie pytanie, jak byś się czuł, gdyby ta informacja została umieszczona na pierwszej stronie popularnego magazynu.
+
+      To forum jest otwarte, więc wyszukiwarki indeksują wszystkie dyskusje. Upewnij się, że nie musisz się wstydzić za publikowanie wiadomości, linki i obrazy przed znajomymi i rodziną.
+
+      <a name="keep-tidy"></a>
+
+      ## [Utrzymuj porządek](#keep-tidy)
+
+      Włóż trochę wysiłku w utrzymanie dyskusji, abyśmy mogli poświęcić więcej czasu na dyskusję, a mniej na sprzątanie:
+
+       * Nie publikuj tematu w złym dziale
+       * Nie publikuj tego samego postu w wielu wątkach
+      * Nie odbiegaj od tematu dyskusji
+      * Nie zmieniaj omawianego tematu, zmieniając go w trakcie.
+      * Nie podpisuj swoich postów &mdash; każdy post zawiera informacje o Twoim profilu.
+
+      Zamiast publikować „+1” lub „Zgadzam sie”, użyj przycisku lubię to. Zamiast kierować istniejący temat w zupełnie innym kierunku, użyj opcji odpowiedz jako temat połączony.
+
+      <a name="stealing"></a>
+
+      ## [Publikuj tylko własne rzeczy](#stealing)
+
+      Nie możesz publikować niczego cyfrowego, co należy do kogoś innego, bez pozwolenia. Nie możesz publikować opisów, linków ani metod kradzieży czyjejś własności intelektualnej (oprogramowania, wideo, audio, obrazów) lub łamania jakiegokolwiek innego prawa.
+
+      <a name="power"></a>
+
+      ## [Napędzany przez Ciebie](#power)
+
+      Ta witryna jest obsługiwana przez [przyjazny lokalny personel](%{base_path}/about) i *Ciebie*, społeczność. Jeśli masz dodatkowe pytania dotyczące tego, jak powinno to działać, otwórz nowy temat w [kategorii opinii o witrynie](%{base_path}/c/site-feedback) i porozmawiajmy! Jeśli wystąpi krytyczny lub pilny problem, którego nie można rozwiązać za pomocą tematu lub flagi, skontaktuj się z nami za pośrednictwem [strony personelu](%{base_path}/about).
+
+      <a name="tos"></a>
+
+      ## [Warunki usługi](#tos)
+
+      Tak, język prawniczy jest nudny, ale musimy się chronić &ndash; co za tym idzie, Ciebie i Twoje dane &ndash; przeciwko nieprzyjaznym ludziom. Mamy [Warunki korzystania z usługi](%{base_path}/tos) opisujące Twoje (i nasze) zachowanie oraz prawa związane z treścią, prywatnością i przepisami. Aby korzystać z tej usługi, musisz zgodzić się na przestrzeganie naszych[TOS](%{base_path}/tos).
   tos_topic:
     title: "Warunki użytkowania"
     body: |
@@ -4041,7 +4187,9 @@ pl_PL:
     mass_award:
       errors:
         invalid_csv: Natrafiliśmy na błąd w linii %{line_number}. Upewnij się, że plik CSV zawiera jeden adres w każdej linii.
+        too_many_csv_entries: Za dużo wpisów w pliku CSV. Podaj plik CSV zawierający nie więcej niż %{count} wpisów.
         badge_disabled: Najpierw włącz odznakę %{badge_name}.
+        cant_grant_multiple_times: Nie można wielokrotnie przyznać odznaki %{badge_name} pojedynczemu użytkownikowi.
     editor:
       name: Edytor
       description: Pierwsza edycja
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index 86a359dc20..0fd2109b15 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -1349,7 +1349,6 @@ pt:
     unknown_error: "Existe um problema com a sua conta. Por favor contacte o administrador do site."
     timeout_expired: "Expirou o tempo de login, por favor tente entrar de novo."
   original_poster: "Participante Original"
-  most_posts: "Maior parte das mensagens"
   most_recent_poster: "Participante Mais Recente"
   frequent_poster: "Participante Frequente"
   redirected_to_top_reasons:
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index 45e698e0d6..73f63846e5 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -52,20 +52,25 @@ pt_BR:
   redirect_warning: "Não foi possível confirmar se o link selecionado foi postado no fórum. Se deseja continuar mesmo assim, selecione o link abaixo."
   on_another_topic: "Em outro tópico"
   inline_oneboxer:
+    topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number} por %{username}"
   themes:
     bad_color_scheme: "Não é possível atualizar o tema, paleta de cores inválida"
     other_error: "Ocorreu um erro ao atualizar o tema"
+    ember_selector_error: "Desculpe, usar #ember or . seletores .ember-view CSS não é permitido, porque esses nomes são gerados dinamicamente durante a execução e mudarão ao longo do tempo, podendo resultar em um CSS quebrado. Tente um seletor diferente."
     compile_error:
       unrecognized_extension: "Extensão de arquivo não reconhecida: %{extension}"
     import_error:
+      generic: Ocorreu um erro ao importar esse tema
       about_json: "Erro ao importar: about.json não existe ou é inválido. Tem certeza de que é um tema do Discourse?"
       about_json_values: "about.json contém valores inválidos: %{errors}"
       modifier_values: "about.json contém valores inválidos: %{errors}"
       git: "Erro ao clonar o repositório git, o acesso foi negado ou o repositório não foi encontrado"
+      git_ref_not_found: "Não é possível conseguir a referência GIT: %{ref}"
       unpack_failed: "Falha ao descompactar o arquivo"
       file_too_big: "O arquivo não compactado é muito grande."
       unknown_file_type: "O arquivo que você enviou não parece ser um tema válido do Discourse."
+      not_allowed_theme: "\"%{repo}\" não está na lista de temas permitidos (confira a configuração global \"allowed_theme_repos\")."
     errors:
       component_no_user_selectable: "Componentes do tema não podem ser selecionados pelo(a) usuário(a)"
       component_no_default: "Componentes do tema não podem ser o tema padrão"
@@ -98,6 +103,10 @@ pt_BR:
       maximum_staged_user_per_email_reached: "A quantidade máxima de usuários(as) encenados(as) criados(as) por e-mail foi atingida."
       no_subject: "(sem assunto)"
       no_body: "(sem corpo)"
+      missing_attachment: "(Falta o anexo %{filename})"
+      continuing_old_discussion:
+        one: "Continue a discussão em [%{title}](%{url}), porque foi criada há mais de %{count} dia."
+        other: "Continue a discussão em [%{title}](%{url}), porque foi criada há mais de %{count} dias."
       errors:
         empty_email_error: "Ocorre quando o e-mail não processado recebido estiver em branco."
         no_message_id_error: "Ocorre quando o e-mail não tem cabeçalho \"Message-Id\"."
@@ -116,7 +125,10 @@ pt_BR:
         bounced_email_error: "O e-mail é um relatório de e-mails devolvido."
         screened_email_error: "Ocorre quando o endereço de e-mail do remetente já foi filtrado."
         unsubscribe_not_allowed: "Ocorre quando não é permitido cancelar a associação por e-mail para este(a) usuário(a)"
+        email_not_allowed: "Acontece quando o endereço de e-mail não está na lista de permissões ou está na lista de proibições."
       unrecognized_error: "Erro desconhecido"
+    secure_media_placeholder: "Redigido: este site tem mídias seguras ativada, acesse o tópico ou clique em Visualizar mídias para exibir as mídias anexas."
+    view_redacted_media: "Exibir mídias"
   errors: &errors
     format: ! "%{attribute} %{message}"
     format_with_full_message: "<b>%{attribute}</b>: %{message}"
@@ -138,6 +150,9 @@ pt_BR:
       inclusion: não está incluso(a) na lista
       invalid: é inválido(a)
       is_invalid: "não faz muito sentido. É uma frase completa?"
+      is_invalid_meaningful: "parece confuso, a maioria das palavras contém a mesma repetida?"
+      is_invalid_unpretentious: "parece confuso, uma ou mais palavras são muito grandes?"
+      is_invalid_quiet: "parece confuso, você quis digitar tudo em MAIÚSCULO?"
       invalid_timezone: "'%{tz}' não é um fuso horário válido"
       contains_censored_words: "contém as seguintes palavras censuradas: %{censored_words}"
       less_than: precisa ser menor que %{count}
@@ -149,6 +164,9 @@ pt_BR:
       max_emojis: "não pode ter mais que %{max_emojis_count} emojis"
       emojis_disabled: "Não pode ter emoji"
       ip_address_already_screened: "já está incluso(a) em uma regra existente"
+      restrict_dependent_destroy:
+        one: "Não é possível excluir o registro porque existe um registro dependente %{record}"
+        other: "Não é possível excluir o registro porque existem registros dependentes %{record}"
       too_long:
         one: é muito longo (no máximo %{count} caractere)
         other: é muito longo (no máximo %{count} caracteres)
@@ -159,6 +177,7 @@ pt_BR:
         one: tem o tamanho errado (precisa ter %{count} caractere)
         other: tem o tamanho errado (precisa ter %{count} caracteres)
       other_than: "precisa ser diferente de %{count}"
+      auth_overrides_username: "O nome do(a) usuário(a) precisa ser atualizado no provedor de autenticação porque a configuração \"auth_overrides_username\" está ativada."
     template:
       body: ! "Houve problemas com os seguintes campos:"
       header:
@@ -175,10 +194,17 @@ pt_BR:
       default_tags_already_selected: "Você não pode selecionar uma etiqueta usada em outra lista."
       s3_upload_bucket_is_required: "Você não pode ativar envios para o S3, a não ser que tenha informado o \"s3_upload_bucket\"."
       enable_s3_uploads_is_required: "Você não pode ativar o inventário para o S3, a não ser que tenha ativado os envios para o S3."
+      page_publishing_requirements: "A publicação da página não pode ser ativada se houver mídias seguras ativadas."
       s3_backup_requires_s3_settings: "Você não pode usar o S3 como local de backup, a não ser que você tenha informado o \"%{setting_name}\"."
       s3_bucket_reused: "Você não pode usar o mesmo bucket para \"s3_upload_bucket\" e \"s3_backup_bucke\"'. Escolha um bucket diferente ou use um caminho diferente para cada bucket."
       secure_media_requirements: "Envios S3 devem ser ativados antes da mídia segura."
+      share_quote_facebook_requirements: "É preciso definir uma id do app Facebook para permitir o compartilhamento de citação para Facebook."
+      second_factor_cannot_enforce_with_socials: "Você não pode aplicar 2FA com entrada com contas de redes sociais ativada. Primeiro você deve desativar a entrada com conta via: %{auth_provider_names}"
       second_factor_cannot_be_enforced_with_disabled_local_login: "Você não pode impor a 2FA se a autenticação local estiver desativada."
+      second_factor_cannot_be_enforced_with_discourse_connect_enabled: "Não é possível aplicar 2FA se o DiscourseConnect estiver ativado."
+      local_login_cannot_be_disabled_if_second_factor_enforced: "Não é possível desativar a entrada com conta em modo local se o 2FA estiver aplicado. Desative o 2FA aplicado antes de desativar entradas com conta em modo local."
+      cannot_enable_s3_uploads_when_s3_enabled_globally: "Não possível ativar envios S3 porque os envios S3 já estão ativados globalmente, e ativar este nível do site pode causar problemas críticos com os envios."
+      cors_origins_should_not_have_trailing_slash: "Você não deve adicionar a barra à direita (/) às origens CORS."
     conflicting_google_user_id: 'A ID da conta Google para esta conta foi alterada. A intervenção da equipe é necessária por razões de segurança. Entre em contato com a equipe e direcione para <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
     onebox:
       invalid_address: "Desculpe, não foi possível gerar uma pré-visualização desta página, porque o servidor \"%{hostname}\" não pôde ser encontrado. Em vez da pré-visualização, apenas um link aparecerá na sua postagem. :cry:"
@@ -186,21 +212,48 @@ pt_BR:
       missing_data:
         one: "Desculpe, não foi possível gerar uma pré-visualização desta página, porque a etiqueta OEmbed/OpenGraph não foi encontrada: %{missing_attributes}"
         other: "Desculpe, não foi possível gerar uma pré-visualização desta página, porque as etiquetas OEmbed/OpenGraph não foram encontradas: %{missing_attributes}"
+  word_connector:
+    comma: ", "
   invite:
+    expired: "Seu token de convite expirou. Entre em <a href='%{base_url}/about'>contato com a equipe</a>."
     not_found: "Seu token de convite é inválido. Entre em <a href='%{base_url}/about'>contato com a equipe</a>."
     not_found_json: "Seu token de convite é inválido. Entre em contato com a equipe."
+    not_matching_email: "O seu endereço de e-mail e o endereço de e-mail associado com o token de convite não são iguais. Entre em contato com a equipe."
+    not_found_template: |
+      <p>O seu convite <a href="%{base_url}">%{site_name}</a> já foi resgatado.</p>
+
+      <p>Se você se lembrar da sua senha, <a href="%{base_url}/login">entre com a sua conta</a>.</p>
+
+      <p>Caso contrário, <a href="%{base_url}/password-reset">redefina a senha</a>.</p>
+    not_found_template_link: |
+      <p>O convite para <a href="%{base_url}">%{site_name}</a> não pode ser mais resgatado. Peça que enviem outro convite.</p>
     user_exists: "Não há necessidade de convidar <b>%{email}</b>, <a href='%{base_path}/u/%{username}/summary'>já tem uma conta!</a>"
+    invite_exists: "Você já convidou <b>%{email}</b>"
     invalid_email: "%{email}' não é um endereço de e-mail válido."
+    rate_limit:
+      one: "Você já enviou %{count} convite no último dia, aguarde %{time_left} antes de tentar novamente."
+      other: "Você já enviou %{count} convites no último dia, aguarde %{time_left} antes de tentar novamente."
     confirm_email: "<p>Você está quase pronto(a)! Enviamos um e-mail de ativação para o seu endereço de e-mail. Siga as instruções no e-mail para ativar sua conta.</p><p>Caso contrário, verifique sua pasta de spam.</p>"
+    cant_invite_to_group: "Você não tem permissão para convidar usuários(as) para grupos específicos. Verifique se você e o proprietário do grupo(a) para o qual você está convidando."
     disabled_errors:
+      discourse_connect_enabled: "Convites estão desativados porque o DiscourseConnect está ativado."
       invalid_access: "Você não tem permissão para visualizar o recurso solicitado."
+    requires_groups: "Convite salvo. Para conceder acesso ao tópico especificado, adicione um dos grupos a seguir: %{groups}."
   bulk_invite:
     file_should_be_csv: "O arquivo atualizado deve ter o formato csv."
     max_rows: "Os primeiros %{max_bulk_invites} convites foram enviados. Tente dividir o arquivo em partes menores."
     error: "Houve um erro ao tentar enviar este arquivo. Tente novamente mais tarde."
+  invite_link:
+    email_taken: "Este e-mail já está em uso. Se você já tiver uma conta, entre com ela ou redefina a senha."
+    max_redemptions_limit: "deve estar entre 2 e %{max_limit}."
   topic_invite:
     failed_to_invite: "O(a) usuário(a) não pode ser convidado(a) para este tópico sem uma associação de grupo em um dos seguintes grupos: %{group_names}."
     user_exists: "Desculpe, este(a) usuário(a) já foi convidado(a). Você pode convidar um(a) usuário(a) para um tópico apenas uma vez."
+    muted_invitee: "Desculpe, você foi silenciado(a) por este(a) usuário(a)."
+    muted_topic: "Desculpe, este(a) usuário(a) silenciou este tópico."
+    receiver_does_not_allow_pm: "Desculpe, esse usuário não permite que você envie mensagens privadas."
+    sender_does_not_allow_pm: "Desculpe, você não permite que o(a) usuário(a) envie mensagens privadas."
+    user_cannot_see_topic: "%{username} não pode visualizar o tópico."
   backup:
     operation_already_running: "Uma operação está sendo executada. Não é possível iniciar um novo trabalho agora."
     backup_file_should_be_tar_gz: "O arquivo de backup deve ser um arquivo .tar.gz."
@@ -220,6 +273,8 @@ pt_BR:
   email_template_cant_be_modified: "Este modelo de e-mail não pode ser alterado"
   invalid_whisper_access: "Os sussurros não estão ativados ou você não tem acesso para criar postagens de sussurro"
   not_in_group:
+    title_topic: "Você precisa pedir associação ao grupo \"%{group}\" para ver este tópico."
+    title_category: "Você precisa pedir associação ao grupo \"%{group}\" para ver esta categoria."
     request_membership: "Pedir para se associar"
     join_group: "Participar do grupo"
   deleted_topic: "Ops! Este tópico foi excluído e não está mais disponível."
@@ -237,6 +292,7 @@ pt_BR:
     continue: "Continuar discussão"
     error: "Erro na incorporação"
     referer: "Referencial:"
+    error_topics: "A configuração do site \"lista de tópicos incorporados\" foi ativada"
     mismatch: "O referencial não foi enviado ou não correspondeu a nenhum dos seguintes hosts:"
     no_hosts: "Nenhum host foi configurado para incorporação."
     configure: "Configurar incorporação"
@@ -264,6 +320,11 @@ pt_BR:
   too_many_mentions_newuser:
     one: "Desculpe, usuários(as) novos(as) podem mencionar apenas um(a) usuário(as) em uma postagem."
     other: "Desculpe, usuários(as) novos(as) podem mencionar apenas %{count} usuários(as) em uma postagem."
+  no_embedded_media_allowed_trust: "Desculpe, n"
+  no_embedded_media_allowed: "Desculpe, novos(as) usuários(as) não podem incorporar itens de mídia em postagens."
+  too_many_embedded_media:
+    one: "Desculpe, novos(as) usuários(as) só podem inserir um item de mídia incorporado em uma postagem."
+    other: "Desculpe, novos(as) usuários(as) só podem inserir %{count} item de mídia incorporado em uma postagem."
   no_attachments_allowed: "Desculpe, novos(as) usuários(as) não podem inserir anexos nas postagens."
   too_many_attachments:
     one: "Desculpe, novos(as) usuários(as) podem inserir apenas %{count} anexo em uma postagem."
@@ -282,7 +343,10 @@ pt_BR:
   max_pm_recipients: "Desculpe, você pode enviar uma mensagem para no máximo %{recipients_limit} destinatários."
   pm_reached_recipients_limit: "Desculpe, você não pode ter mais de %{recipients_limit} destinatários em uma mensagem."
   removed_direct_reply_full_quotes: "Citação removida automaticamente de toda a postagem anterior."
+  watched_words_auto_tag: "Tópico etiquetado automaticamente"
+  secure_upload_not_allowed_in_public_topic: "Desculpe, mas os envios seguros a seguir não podem ser usados em um tópico público: %{upload_filenames}."
   create_pm_on_existing_topic: "Desculpe, você não pode criar uma MP em um tópico existente."
+  slow_mode_enabled: "Este tópico está no modo lento."
   just_posted_that: "é muito parecido com a sua postagem recente"
   invalid_characters: "contém caracteres inválidos"
   is_invalid: "não faz muito sentido. É uma frase completa?"
@@ -296,6 +360,9 @@ pt_BR:
   rss_num_posts:
     one: "%{count} mensagem"
     other: "%{count} mensagens"
+  rss_num_participants:
+    one: "%{count} participante"
+    other: "%{count} participantes"
   read_full_topic: "Ler tópico completo"
   private_message_abbrev: "Msg"
   rss_description:
@@ -318,10 +385,12 @@ pt_BR:
   too_late_to_edit: "Esta postagem foi criada há muito tempo. Ela não pode mais ser editada ou excluída."
   edit_conflict: "Esta postagem foi editada por outro(a) usuário(a) e suas alterações não podem mais ser salvas."
   revert_version_same: "A versão atual é a mesma versão para a qual você está tentando reverter."
+  cannot_edit_on_slow_mode: "Este tópico está no modo lento. Para incentivar discussões reflexivas e selecionadas. Não é permitido editar postagens antigas deste tópico no modo lento."
   excerpt_image: "imagem"
   bookmarks:
     errors:
       already_bookmarked_post: "Você não pode adicionar a mesma postagem aos favoritos duas vezes."
+      too_many: "Desculpe, não é possível adicionar mais de %{limit} favoritos, acesse <a href='%{user_bookmarks_url}'>%{user_bookmarks_url}</a> para remover alguns."
       cannot_set_past_reminder: "Você não pode definir um lembrete de favorito em uma data passada."
       cannot_set_reminder_in_distant_future: "Você não pode definir um lembrete de favorito mais de dez anos posteriormente."
       time_must_be_provided: "a hora deve ser informada para todos os lembretes"
@@ -350,6 +419,12 @@ pt_BR:
       email_already_used_in_category: "\"%{email}\" já foi utilizado pela categoria \"%{category_name}\"."
       cant_allow_membership_requests: "Você não pode permitir pedidos de associação para um grupo sem proprietário(a)."
       already_requested_membership: "Você já pediu associação para este grupo."
+      adding_too_many_users:
+        one: "No máximo %{count} usuário(a) pode ser adicionado(a) uma vez"
+        other: "No máximo %{count} usuários(as) podem ser adicionados(as) uma vez"
+      usernames_or_emails_required: "Nomes de usuário(a) ou e-mails devem estar presentes"
+      no_invites_with_discourse_connect: "É possível convidar apenas usuários(as) registrados(as) quando o DiscourseConnect estiver ativado"
+      no_invites_without_local_logins: "É possível convidar apenas usuários(as) registrados(as) quando entradas de conta em modo local estiver destivado"
     default_names:
       everyone: "todos(as)"
       admins: "administração"
@@ -406,6 +481,20 @@ pt_BR:
       Você pode editar sua resposta anterior para adicionar uma citação selecionando um texto e clicando no botão <b>responder citação</b> que aparecerá.
 
       Fica mais fácil para todos(as) lerem tópicos com poucas respostas e muitas informações em vez de muitas respostas individuais e curtas.
+    dominating_topic: |
+      ### Permita que outras pessoas participem da conversa
+
+      Este tópico é muito importante para você &ndash; você postou mais de %{percent}% das respostas aqui.
+
+      Seria ainda melhor se você desse espaço para que outras pessoas compartilhassem seus pontos de vista também. Poderia convidá-las?
+    get_a_room: |
+      ### Incentive todos a se envolverem na conversa
+
+      Você respondeu %{count} vezes para @%{reply_username} neste tópico em particular!
+
+      Uma boa discussão inclui muitas vozes e perspectivas. Você consegue envolver mais alguém?
+
+      E não se esqueça, se você quiser continuar sua conversa com este usuário em particular fora da visão pública, [envie-o uma mensagem pessoal](%{base_path}/u/%{reply_username}).
     too_many_replies: |
       ### Você atingiu o limite de respostas para este tópico
 
@@ -440,7 +529,10 @@ pt_BR:
               cant_send_pm: "Desculpe, você não pode enviar uma mensagem pessoal para esse(a) usuário(a)."
               no_user_selected: "Você deve escolher um(a) usuário(a) válido(a)."
               reply_by_email_disabled: "Respostas por e-mail foram desativadas."
+              send_to_email_disabled: "Desculpe, você não pode enviar mensagens pessoais por e-mail."
               target_user_not_found: "Um(a) dos(as) usuários(as) para quem você está enviando esta mensagem não foi encontrado(a)."
+              unable_to_update: "Houve um erro ao atualizar esse tópico."
+              unable_to_tag: "Houve um erro ao etiquetar o tópico."
             featured_link:
               invalid: "é inválida. A URL deve conter http:// ou https://."
               invalid_category: "não pode ser editado(a) nesta categoria."
@@ -459,6 +551,10 @@ pt_BR:
               same_as_password: "é igual à sua senha."
             ip_address:
               signup_not_allowed: "Não é permitido cadastrar esta conta."
+        user_profile:
+          attributes:
+            featured_topic_id:
+              invalid: "Este tópico não pode ser apresentado no seu perfil."
         user_email:
           attributes:
             user_id:
@@ -484,6 +580,7 @@ pt_BR:
               in_the_past: "deve estar no futuro."
             duration_minutes:
               cannot_be_zero: "deve ser maior que 0."
+              exceeds_maximum: "não pode ter mais de 20 anos."
         translation_overrides:
           attributes:
             value:
@@ -492,6 +589,8 @@ pt_BR:
           attributes:
             word:
               too_many: "Muitas palavras para esta ação"
+            base:
+              invalid_url: "A URL de substituição não é válida"
       <<: *errors
   uncategorized_category_name: "Sem categoria"
   vip_category_name: "Saguão"
@@ -578,8 +677,20 @@ pt_BR:
     slow_down: "Você executou esta ação muitas vezes. Tente novamente mais tarde."
     too_many_requests: "Você já executou esta ação muitas vezes. Espere%{time_left} antes de tentar novamente."
     by_type:
+      first_day_replies_per_day: "Agradecemos o seu entusiasmo, continue assim! Dito isso, para a segurança da nossa comunidade, você alcançou a quantidade máxima de respostas que um(a) novo(a) usuário(a) pode criar no primeiro dia. Aguarde %{time_left} e você poderá criar mais respostas."
+      first_day_topics_per_day: "Agradecemos o seu entusiasmo! Dito isso, para a segurança da nossa comunidade, você alcançou a quantidade máxima de tópicos que um(a) novo(a) usuário(a) pode criar no primeiro dia. Aguarde %{time_left} e você poderá criar mais tópicos."
+      create_topic: "Você está criando tópicos muito rápido. Aguarde %{time_left} antes de tentar novamente."
+      create_post: "Você está respondendo muito rápido. Aguarde %{time_left} antes de tentar novamente."
+      delete_post: "Você está excluindo as postagens muito rápido. Aguarde %{time_left} antes de tentar novamente."
+      public_group_membership: "Você está entrando/saindo de grupos com frequência. Aguarde %{time_left} antes de tentar novamente."
+      topics_per_day: "Você alcançou a quantidade máxima de novos tópicos permitidos por dia. Crie mais tópicos novos em %{time_left}."
+      pms_per_day: "Você alcançou a quantidade máxima de mensagens novas permitidas por dia. Crie mais mensagens novas em %{time_left}."
+      create_like: "Uau! Você está distribuindo muito afeto! Você alcançou a quantidade máxima de curtidas por hoje, Mas, à medida que ganha mais níveis de confiança, você receberá mais curtidas por dia. Você poderá curtir postagens novamente em %{time_left}."
+      create_bookmark: "Você alcançou a quantidade máxima de favoritos por dia. Crie mais favoritos em %{time_left}."
+      edit_post: "Você alcançou a quantidade máxima de edições por dia. Envie mais edições em %{time_left}."
       live_post_counts: "Você está pedindo contagens de postagens em tempo real muito rápido. Espere %{time_left} antes de tentar novamente."
       unsubscribe_via_email: "Você atingiu o número máximo de cancelamentos de associação por e-mail. Espere %{time_left} antes de tentar novamente."
+      topic_invitations_per_day: "Você alcançou a quantidade máxima de convites para tópicos. Envie mais convites em %{time_left}."
     hours:
       one: "%{count} hora"
       other: "%{count} horas"
@@ -683,6 +794,7 @@ pt_BR:
       unknown: "navegador desconhecido"
     device:
       android: "Dispositivo Android"
+      chromebook: "Chrome OS"
       ipad: "iPad"
       iphone: "iPhone"
       ipod: "iPod"
@@ -693,6 +805,7 @@ pt_BR:
       unknown: "dispositivo desconhecido"
     os:
       android: "Android"
+      chromeos: "Chrome OS"
       ios: "iOS"
       linux: "Linux"
       macos: "macOS"
@@ -703,14 +816,19 @@ pt_BR:
     confirmed: "O seu email foi atualizado."
     please_continue: "Continuar no %{site_name}"
     error: "Ocorreu um erro ao alterar o seu endereço de email. Talvez o endereço já esteja em uso?"
+    doesnt_exist: "Esse endereço de e-mail não está associado à sua conta."
     error_staged: "Ocorreu um erro ao alterar o seu endereço de e-mail. O endereço já está usado por outro(a) usuário(a) encenado(a)."
     already_done: "Desculpe, este link de confirmação não é mais válido. Talvez o seu e-mail já tenha sido alterado?"
     confirm: "Confirmar"
+    max_secondary_emails_error: "Você alcançou o limite máximo de e-mails secundários."
     authorizing_new:
       title: "Confirme seu novo e-mail"
+      description: "Confirme que gostaria de mudar seu endereço de e-mail para:"
+      description_add: "Confirme que você gostaria de adicionar um endereço de e-mail alternativo:"
     authorizing_old:
       title: "Troque seu endereço de e-mail"
       description: "Confirme a alteração do seu endereço de e-mail"
+      description_add: "Confirme que você gostaria de adicionar um endereço de e-mail alternativo:"
       old_email: "E-mail antigo: %{email}"
       new_email: "Novo e-mail: %{email}"
       almost_done_title: "Confirmando seu novo endereço de e-mail"
@@ -776,6 +894,7 @@ pt_BR:
       title: "erro no rascunho"
       description: "O rascunho está sendo editado em outra janela. Recarregue esta página."
   draft_backup:
+    pm_title: "Rascunhos de backup de tópicos em andamento"
     pm_body: "Tópico contendo rascunhos salvos"
   user_activity:
     no_default:
@@ -783,6 +902,7 @@ pt_BR:
       others: "Nenhuma atividade."
     no_bookmarks:
       self: "Você não tem postagens favoritas. Os favoritos permitem que você consulte rapidamente postagens específicas."
+      search: "Nenhum favorito encontrado com a consulta de pesquisa fornecida."
       others: "Nenhum favorito."
     no_likes_given:
       self: "Você não curtiu nenhuma postagem."
@@ -792,9 +912,33 @@ pt_BR:
       others: "Sem respostas."
     no_drafts:
       self: "Você não tem rascunhos. Comece a compor uma resposta em qualquer tópico e ela será salva automaticamente como um novo rascunho."
+  email_settings:
+    pop3_authentication_error: "Ocorreu um problema com as credenciais POP3 informadas, verifique o nome do(a) usuário(a) e a senha e tente novamente."
+    imap_authentication_error: "Ocorreu um problema com as credenciais IMAP informadas, verifique o nome do(a) usuário(a) e a senha e tente novamente."
+    imap_no_response_error: "Ocorreu um erro ao se comunicar com o servidor IMAP. %{message}"
+    smtp_authentication_error: "Ocorreu um problema com as credenciais SMTP informadas, verifique o nome do(a) usuário(a) e a senha e tente novamente."
+    authentication_error_gmail_app_password: 'É preciso ter uma senha específica para o aplicativo. Saiba mais neste <a target="_blank" href="https://support.google.com/accounts/answer/185833">artigo de ajuda do Google</a>'
+    smtp_server_busy_error: "O servidor SMTP está ocupado neste momento, tente novamente mais tarde."
+    smtp_unhandled_error: "Ocorreu um erro sem tratamento ao se comunicar com o servidor SMTP. %{message}"
+    imap_unhandled_error: "Ocorreu um erro sem tratamento ao se comunicar com o servidor IMAP. %{message}"
+    connection_error: "Ocorreu um problema ao se conectar com o servidor, verifique o nome e a porta do servidor e tente novamente."
+    timeout_error: "O tempo de conexão com o servidor se esgotou, verifique a porta e o nome do servidor e tente novamente."
+    unhandled_error: "Erro sem tratamento ao testar as configurações do e-mail. %{message}"
   webauthn:
     validation:
+      invalid_type_error: "O tipo de webauthn informado era inválido. Os tipos válidos são webauthn.get e webauthn.create."
+      challenge_mismatch_error: "O desafio fornecido não corresponde ao desafio gerado pelo servidor de autenticação."
+      invalid_origin_error: "A origem do pedido de autenticação não corresponde à origem do servidor."
+      malformed_attestation_error: "Ocorreu um erro ao decodificar os dados de atestado."
+      invalid_relying_party_id_error: "A ID da parte confiável do pedido de autenticação não corresponde à ID da parte confiável do servidor."
       user_verification_error: "É preciso verificar o(a) usuário(a)."
+      unsupported_public_key_algorithm_error: "O algoritmo de chave pública fornecido não é compatível com o servidor."
+      unsupported_attestation_format_error: "O formato de atestado não é compatível com o servidor."
+      credential_id_in_use_error: "A ID de credencial fornecida já está sendo usada."
+      public_key_error: "A verificação de chave pública da credencial falhou."
+      ownership_error: "A chave de segurança não pertence ao(à) usuário(a)."
+      not_found_error: "Não foi possível encontrar uma chave de segurança com a ID de credencial fornecida."
+      unknown_cose_algorithm_error: "O algoritmo usado para a chave de segurança não foi reconhecido."
   topic_flag_types:
     spam:
       title: "Spam"
@@ -831,17 +975,22 @@ pt_BR:
     description: "as preferências de e-mail de <b>%{email}</b> foram atualizadas. Para alterar suas configurações de e-mail, <a href='%{url}'>acesse suas preferências de usuário(a)</a>."
     topic_description: "Para se associar novamente em %{link}, use o controle de notificações na parte inferior ou no canto direito do tópico."
     private_topic_description: "Para se associar novamente, use o controle de notificações na parte inferior ou à direita do tópico."
+  uploads:
+    marked_insecure_from_theme_component_reason: "envio usado no componente de tema"
   unsubscribe:
     title: "Cancelar associação"
     stop_watching_topic: "Parar de acompanhar este tópico, %{link}"
     mute_topic: "Silenciar todas as notificações para este tópico, %{link} "
     unwatch_category: "Parar de acompanhar todos os tópicos na categoria %{category}"
     mailing_list_mode: "Desativar o modo lista de endereçamento"
+    all: "Não enviar e-mail de %{sitename}"
     different_user_description: "No momento, você está entrou como um(a) usuário(a) diferente daquele(a) para quem mandamos o e-mail. Saia ou entre no modo anônimo(a) de seu navegador e tente novamente."
+    not_found_description: "Desculpe, não foi possível encontrar o cancelamento desta inscrição. Talvez o link no seu e-mail seja muito antigo e tenha expirado."
     log_out: "Sair"
     submit: "Salvar preferências"
     digest_frequency:
       title: "Você está recebendo e-mails de resumo %{frequency}"
+      never_title: "Você não está recebendo e-mail de resumo"
       select_title: "Definir a frequência de e-mails de resumo para:"
       never: "nunca"
       every_30_minutes: "a cada 30 minutos"
@@ -872,6 +1021,7 @@ pt_BR:
       read: "Ler tudo"
       write: "Escrever tudo"
       one_time_password: "Criar um token de acesso único com a conta"
+      bookmarks_calendar: "Ler lembretes de favorito"
     invalid_public_key: "Desculpe, a chave pública é inválida."
     invalid_auth_redirect: "Desculpe, este host auth_redirect não é permitido."
     invalid_token: "Token ausente, inválido ou expirado."
@@ -944,7 +1094,13 @@ pt_BR:
       description: "Quantidade de usuários(as) que fizeram sua primeira postagem durante este período."
     trust_level_growth:
       title: "Crescimento de nível de confiança"
+      xaxis:
+        tl1_reached: "Alcançou TL1"
+        tl2_reached: "Alcançou TL2"
+        tl3_reached: "Alcançou TL3"
+        tl4_reached: "Alcançou TL4"
       yaxis: "Dia"
+      description: "Quantidade de usuários(as) que aumentaram seu nível de confiança neste período."
     consolidated_page_views:
       title: "Visualizações de página consolidadas"
       xaxis:
@@ -1201,8 +1357,13 @@ pt_BR:
     sidekiq_warning: 'O Sidekiq não está em execução. Muitas tarefas, como envio de e-mails, são executadas de forma assíncrona pelo Sidekiq. Verifique-se que pelo menos um processo sidekiq esteja em execução. <a href="https://github.com/mperham/sidekiq" target="_blank">Aprenda sobre Sidekiq aqui</a>.'
     queue_size_warning: "A quantidade de processos na fila é de %{queue_size}, o que é um número alto. Isso pode indicar um problema com os processos do Sidekiq, ou pode ser necessário adicionar mais trabalhadores do Sidekiq."
     memory_warning: "Seu servidor está rodando com menos de 1 GB de memória total. Pelo menos 1 GB é quantidade de memória recomendada."
+    google_oauth2_config_warning: 'O servidor está configurado para permitir o cadastro e entrada com conta do Google OAuth2 GitHub (enable_google_oauth2_logins), mas a ID do cliente e os valores de segredo de cliente não estão definidos. Vá para <a href="%{base_path}/admin/site_settings">as configurações do site</a> e atualize as configurações. <a href="https://meta.discourse.org/t/configuring-google-login-for-discourse/15858" target="_blank">Consulte este guia para saber mais</a>.'
+    facebook_config_warning: 'O servidor está configurado para permitir o cadastro e entrada com a conta do Facebook (enable_facebook_logins), mas os valores de id do aplicativo e os valores de segredo do app não foram definidos. Vá para <a href="%{base_path}/admin/site_settings">as configurações do site</a> e atualize as configurações. <a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">Veja este guia para saber mais</a>.'
+    twitter_config_warning: 'O servidor está configurado para permitir o cadastro e entrada com a conta do Twitter (enable_twitter_logins), mas a chave e os valores de segredo não foram definidos. Vá para <a href="%{base_path}/admin/site_settings">as configurações do site</a> e atualize as configurações. <a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">Veja este guia para saber mais</a>.'
+    github_config_warning: 'O servidor está configurado para permitir o cadastro e entrada com conta do GitHub (enable_github_logins), mas a ID do cliente e os valores de segredo de cliente não estão definidos. Vá para <a href="%{base_path}/admin/site_settings">as configurações do site</a> e atualize as configurações. <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">Consulte este guia para saber mais</a>.'
     s3_config_warning: 'O servidor está configurado para enviar arquivos para o S3, mas pelo menos uma das seguintes configurações não está definida: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile ou s3_upload_bucket. Acesse <a href="%{base_path}/admin/site_settings">as configurações do site</a> e atualize as configurações. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Consulte "Como configurar envio de imagens para o S3?" para saber mais</a>.'
     s3_backup_config_warning: 'O servidor está configurado para enviar de backup para o S3, mas pelo menos uma das seguintes configurações não está definida: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile ou s3_backup_bucket. Acesse <a href="%{base_path}/admin/site_settings">as configurações do site</a> e atualize as configurações. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Consulte "Como configurar envio de imagens para o S3?" para saber mais</a>.'
+    s3_cdn_warning: 'O servidor está configurado para enviar arquivos para S3, mas não há nenhum S3 CDN configurado. Isso pode ocasionar custos S3 elevados e queda de desempenho no site. <a href="https://meta.discourse.org/t/-/148916" target="_blank">Veja "Usando armazenamento de objeto para envios" para saber mais</a>.'
     image_magick_warning: 'O servidor está configurado para criar miniaturas de imagens grandes, mas o ImageMagick não está instalado. Instale o ImageMagick usando seu gerenciador de pacotes favorito ou <a href="https://www.imagemagick.org/script/download.php" target="_blank">baixe a versão mais recente</a>.'
     failing_emails_warning: 'Existem tarefas de e-mail %{num_failed_jobs} que falharam. Verifique seu app.yml e se as configurações do servidor de e-mail estão corretas. <a href="%{base_path}/sidekiq/retries" target="_blank">Veja os trabalhos com falha no Sidekiq</a>.'
     subfolder_ends_in_slash: "Sua configuração de subdiretórios está incorreta. DISCOURSE_RELATIVE_URL_ROOT termina com uma barra."
@@ -1216,10 +1377,14 @@ pt_BR:
     force_https_warning: "Seu site está usando SSL. Mas \"<a href='%{base_path}/admin/site_settings/category/all_results?filter=force_https'>force_https</a>\" ainda não está ativado nas configurações do seu site."
     out_of_date_themes: "Atualizações estão disponíveis para os seguintes temas:"
     unreachable_themes: "Não foi possível verificar se há atualizações para os seguintes temas:"
+    watched_word_regexp_error: "A expressão regular para \"%{action}\" palavras acompanhadas é inválida. Verifique as <a href='%{base_path}/admin/customize/watched_words'>configurações de palavras acompanhadas</a> ou desative as \"configurações do site para expressões regulares\"."
   site_settings:
+    display_local_time_in_user_card: "Exiba a hora local baseada no fuso horário(a) do usuário(a) quando seu cartão de usuário(a) estiver disponível."
     censored_words: "Palavras que serão substituídas automaticamente por &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Exclua automaticamente todas as postagens ocultas que permanecerem ocultas por mais de 30 dias."
+    default_locale: "O idioma padrão desta instância do Discourse. Você pode substituir o texto das categorias e tópicos gerados pelo sistema em <a href='%{base_path}/admin/customize/site_texts' target='_blank'>Personalizar/texto</a>."
     allow_user_locale: "Permitir que os(as) usuários(as) escolham suas próprias preferências de idioma da interface"
+    set_locale_from_accept_language_header: "definir idioma de interface para usuários(as) anônimos(as) no cabeçalhos de idioma do seu navegador"
     support_mixed_text_direction: "É compatível com direções de texto mescladas da esquerda para a direita e da direita para a esquerda."
     min_post_length: "Tamanho mínimo permitido de postagem em caracteres"
     min_first_post_length: "Tamanho mínimo permitido de primeira postagem (corpo do tópico) em caracteres"
@@ -1227,6 +1392,7 @@ pt_BR:
     max_post_length: "Tamanho máximo permitido de postagem em caracteres"
     topic_featured_link_enabled: "Ative a postagem de um link com tópicos."
     show_topic_featured_link_in_digest: "Exiba o link do tópico em destaque no e-mail de resumo."
+    min_topic_views_for_delete_confirm: "Quantidade mínima de visualizações que um tópico deve ter para que um pop-up de confirmação seja exibido ao ser excluído"
     min_topic_title_length: "Tamanho mínimo permitido para o título do tópico em caracteres"
     max_topic_title_length: "Tamanho máximo permitido para o título do tópico em caracteres"
     min_personal_message_title_length: "Tamanho mínimo permitido para o título de uma mensagem em caracteres"
@@ -1243,11 +1409,14 @@ pt_BR:
     category_search_priority_high_weight: "Peso aplicado à classificação para alta prioridade de pesquisa de categoria."
     allow_uncategorized_topics: "Permitir criação de tópicos sem categoria. AVISO: se existe algum tópico sem categoria, você deve movê-los para uma categoria antes de desativar esta opção."
     allow_duplicate_topic_titles: "Permitir tópicos com títulos duplicados e idênticos."
+    allow_duplicate_topic_titles_category: "Permita tópicos com títulos duplicados e idênticos se a categoria for diferente. É preciso desativar allow_duplicate_topic_titles."
     unique_posts_mins: "Com quantos minutos de antecedência um(a) usuário(a) pode criar uma postagem com o mesmo conteúdo outra vez"
     educate_until_posts: "Quando o(a) usuário(a) começa a digitar suas primeiras (n) postagens novas, exiba o pop-up com o painel instrutivo do novo(a) usuário(a) no compositor."
     title: "O nome deste site, como na etiqueta do título."
     site_description: "Descreva este site com uma frase, como na etiqueta de metadescrição."
     short_site_description: "Breve descrição, como etiqueta do título na página inicial."
+    contact_email: "Endereço de e-mail do contato principal responsável por este site. É usado para notificações críticas e também em <a href='%{base_path}/about' target='_blank'>/about</a> para assuntos urgentes."
+    contact_url: "URL de contato deste site. Exibida na página <a href='%{base_path}/about' target='_blank'>/about</a> para assuntos urgentes."
     crawl_images: "Recupere imagens de URLs remotas para inserir as dimensões corretas de largura e altura."
     download_remote_images_to_local: "Transferira para converter imagens remotas em imagens locais. Isso evita imagens quebradas."
     download_remote_images_threshold: "Espaço mínimo necessário em disco para baixar em modo local imagens remotas (em %)"
@@ -1256,6 +1425,8 @@ pt_BR:
     editing_grace_period_max_diff: "Quantidade máxima de alterações de caracteres permitidas no período de carência de edição. Se houver mais alterações, armazene outra revisão de postagem (nível de confiança 0 e 1)"
     editing_grace_period_max_diff_high_trust: "Quantidade máxima de alterações de caracteres permitidas no período de carência de edição. Se houver mais alterações, armazene outra revisão de postagem (nível de confiança 2 e maior)"
     staff_edit_locks_post: "As postagens não poderão ser editadas se forem editadas por membros da equipe"
+    post_edit_time_limit: "O autor(a) tl0 ou tl1 pode editar sua postagem durante (n) minutos após postar. Defina como 0 permanentemente."
+    tl2_post_edit_time_limit: "O autor(a) tl2+ pode editar sua postagem durante (n) minutos após postar. Defina como 0 permanentemente."
     edit_history_visible_to_public: "Permitir que todos(as) vejam as versões anteriores de uma postagem editada. Ao desativar, somente membros da equipe podem ver o histórico de alterações."
     delete_removed_posts_after: "Postagens removidas pelo(a) autor(a) serão excluídas automaticamente após (n) horas. Se o valor definido for 0, as postagens serão excluídas imediatamente."
     max_image_width: "Largura máxima da miniatura de imagens em uma postagem"
@@ -1266,18 +1437,26 @@ pt_BR:
     add_rel_nofollow_to_user_content: 'Adicione nofollow a todo conteúdo incluído pelo(a) usuário(a), exceto links internos (incluindo domínios pai). Para que as mudanças sejam aplicadas, é necessário rodar "rake posts:rebake"'
     exclude_rel_nofollow_domains: "Uma lista de domínios em que o nofollow não deve ser adicionado aos links. example.com também permitirá sub.example.com automaticamente. No mínimo, você deve adicionar o domínio deste site para ajudar os rastreadores da web a encontrar todo o conteúdo. Se outras partes do seu site estiverem em outros domínios, adicione-as também."
     post_excerpt_maxlength: "Tamanho máximo de caracteres para o resumo/trecho de uma postagem."
+    topic_excerpt_maxlength: "O tamanho máximo do trecho/resumo de um tópico, gerado a partir da primeira postagem em um tópico."
     show_pinned_excerpt_mobile: "Mostre trecho de tópicos fixados na visualização para dispositivos móveis."
     show_pinned_excerpt_desktop: "Mostrar trecho de tópicos fixados na visualização para desktop."
     post_onebox_maxlength: "Tamanho máximo para uma postagem do Discourse no Onebox."
     blocked_onebox_domains: "Uma lista de domínios que nunca serão transformados em Onebox."
     allowed_inline_onebox_domains: "Uma lista de domínios que serão colocados em miniatura no Onebox se forem vinculados sem um título"
+    enable_inline_onebox_on_all_domains: "Ignore a configuração do site inline_onebox_domain_whitelist e permita inclusões de Onebox em todos os domínios."
+    force_custom_user_agent_hosts: "Hosts para os quais usar um agente do(a) usuário(a) do Onebox em todos os pedidos. (Especialmente útil para hosts que limitam acesso do agente do(a) usuário(a).)"
     max_oneboxes_per_post: "Quantidade máxima de Onebox em uma postagem."
+    facebook_app_access_token: "Um token gerado do seu segredo e ID do app Facebook. Usado para gerar Oneboxes do Instagram."
     logo: "A imagem do logotipo no canto superior à esquerda do seu site. Use uma imagem retangular larga com 120 de altura e proporção maior que 3:1. Se for deixada em branco, o texto do título do site será exibido."
     logo_small: "A pequena imagem do logotipo no canto superior à esquerda do site, exibida ao rolar para baixo. Use uma imagem quadrada de 120×120. Se for deixada em branco, um glifo de página inicial será exibido."
     digest_logo: "A imagem do logotipo alternativo usada na parte superior do resumo de e-mail do seu site. Use uma imagem retangular larga. Não use uma imagem SVG. Se for deixada em branco, a imagem da configuração \"logotipo\" será usada."
     mobile_logo: "O logotipo usado na versão do seu site para dispositivos móveis. Use uma imagem retangular larga com 120 de altura e proporção maior que 3:1. Se for deixada em branco, a imagem da configuração \"logotipo\" será usada."
+    logo_dark: "Esquema escuro alternativo para a configuração do site \"logotipo\"."
+    logo_small_dark: "Esquema escuro alternativo para a configuração do site \"logotipo pequeno\"."
+    mobile_logo_dark: "Esquema escuro alternativo para a configuração do site \"logotipo para dispositivo móvel\"."
     large_icon: "Imagem usada como base para outros ícones de metadados. Idealmente, deve ser maior que 512x512. Se for deixada em branco, logo_small será usado."
     manifest_icon: "Imagem usada como logotipo/splash no Android. Será redimensionada automaticamente para 512×512. Se for deixada em branco, large_icon será usado."
+    manifest_screenshots: "Capturas de tela que mostram os recursos e funcionalidades da sua instância na sua página de alerta de instalação. Todas as imagens devem ser envios locais e devem ter as mesmas dimensões."
     favicon: "Um favicon para o seu site, consulte <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a>. Para funcionar corretamente em um CDN, precisa ser um png, que será redimensionado para 32x32. Se for deixado em branco, large_icon será usado."
     apple_touch_icon: "Ícone usado para dispositivos Apple touch, que será automaticamente redimensionado para 180x180. Se for deixado em branco, large_icon será usado."
     opengraph_image: "Imagem opengraph padrão, usada quando a página não tiver outra imagem adequada. Se for deixada em branco, large_icon será usado."
@@ -1285,13 +1464,19 @@ pt_BR:
     notification_email: "O endereço de e-mail utilizado ao enviar e-mails do sistema. O domínio especificado deve ter registros SPF, DKIM e PTR devidamente configurados para que os e-mails funcionem corretamente."
     email_custom_headers: "Uma lista delimitada por barras de cabeçalhos de e-mail personalizados"
     email_subject: "Formato de assunto personalizável para e-mails padrão. Acesse <a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801</a>"
+    detailed_404: "Fornece mais detalhes aos(às) usuários(as) sobre o motivo de não poderem acessar um tópico específico. Observação: isso não é tão seguro porque os(as) usuários(as) saberão se uma URL estiver vinculada a um tópico válido."
+    enforce_second_factor: "Obriga os(as) usuários(as) a ativar a autenticação de dois fatores. Selecione \"tudo\" para aplicar a todos os(as) usuários(as). Selecione \"equipe\" para aplicar somente aos(as) usuários(as) da equipe."
     force_https: "Obrigue seu site a usar apenas HTTPS. AVISO: NÃO ative até ter verificado se o HTTPS está totalmente configurado e funcionando em todos os lugares! Você verificou se seu CDN, todas as entradas com conta de rede social e logotipos e dependências externas também são compatíveis com HTTPS?"
+    same_site_cookies: "Use os mesmos cookies do site, eles eliminam todos vetores de solicitação intersite forjada nos navegadores compatíveis (Lax ou Strict). Aviso: o Strict funcionará somente em sites que obrigam entrada com conta e usam um método de autenticação externo."
     summary_score_threshold: "A pontuação mínima requerida para uma postagem ser incluída em \"Resumir este tópico\" "
+    summary_posts_required: "Quantidade mínima de postagens em um tópico antes de ativar \"Resumir este tópico\". As alterações desta configuração serão aplicadas de forma retroativa dentro de uma semana."
+    summary_likes_required: "Quantidade mínima de curtidas em um tópico antes de ativar \"Resumir este tópico\". As alterações desta configuração serão aplicadas de forma retroativa dentro de uma semana."
     summary_percent_filter: "Quando um(a) usuário(a) clicar em \"Resuma este tópico\", exiba as % melhores postagens"
     summary_max_results: "Quantidade máxima de postagens retornadas por \"Resumir este tópico\""
     enable_personal_messages: "Permita que usuários(as) do nível de confiança 1 (configurável por meio do nível mínimo de confiança para enviar mensagens) criem e respondam a mensagens. Nove que a equipe sempre pode enviar mensagens."
     enable_system_message_replies: "Permite que os(as) usuários(as) respondam às mensagens do sistema, mesmo se as mensagens pessoais estiverem desativadas"
     enable_long_polling: "O sistema de mensagens das notificações pode fazer sondagens longas."
+    enable_chunked_encoding: "Ative respostas de codificação em bloco no servidor. Esse recurso funciona na maioria das configurações, mas alguns proxies podem ser armazenados em buffer, atrasando as respostas"
     long_polling_base_url: "URL de base utilizada para \"sondagem longa\" (auando um CDN for configurado, verifique se essa configuração é a padrão). Por exemplo: http://origin.site.com"
     long_polling_interval: "Tempo que o servidor deve aguardar antes de responder aos clientes quando não houver dados para enviar (apenas usuários(as) que entraram com a conta)"
     polling_interval: "Frequência com que clientes devem entrar com a conta, em milisegundos, quando não fizerem sondagem longa"
@@ -1306,6 +1491,9 @@ pt_BR:
     tl2_additional_likes_per_day_multiplier: "Aumentar o limite de curtidas por dia para tl2 (membros) ao multiplicar por este número"
     tl3_additional_likes_per_day_multiplier: "Aumentar o limite de curtidas por dia para tl3 (regular) ao multiplicar por este número"
     tl4_additional_likes_per_day_multiplier: "Aumentar o limite de curtidas por dia para tl4 (líder) ao multiplicar por este número"
+    tl2_additional_edits_per_day_multiplier: "Aumente o limite de edições por dia para tl2 (membro) ao multiplicar por este número"
+    tl3_additional_edits_per_day_multiplier: "Aumentar o limite de edições por dia para tl3 (regular) ao multiplicar por este número"
+    tl4_additional_edits_per_day_multiplier: "Aumentar o limite de edições por dia para tl4 (líder) ao multiplicar por este número"
     num_users_to_silence_new_user: "Se as postagens de um(a) novo(a) usuário(a) receberem num_spam_flags_to_silence_new_user spam sinalizador(es) de usuários(as) diferentes, oculte todas as suas postagens e evite postagens futuras. 0 para desativar."
     num_tl3_flags_to_silence_new_user: "Se as postagens do(a) novo(a) usuário(a) obtiverem muitos sinalizadores de num_tl3_users_to_silence_new_user usuários(as) diferentes do nível de confiança 3, oculte todos as publicações e evite postagens futuras. 0 para desativar."
     num_tl3_users_to_silence_new_user: "Se as postagens de um(a) novo(a) usuário(a) receberem num_tl3_flags_to_silence_new_user sinalizador(es) de usuários(as) de nível de confiança 3, oculte todas as suas postagens e evite postagens futuras. 0 para desativar."
@@ -1315,21 +1503,38 @@ pt_BR:
     enable_markdown_typographer: "Use as regras de tipografia para melhorar a legibilidade do texto: substitua as aspas normais por \"aspas curvas\", (c) (tm) por símbolos, travessão --, etc."
     enable_markdown_linkify: "Tratar como link automaticamente textos parecidos com links: www.example.com e https://example.com serão vinculados automaticamente"
     markdown_linkify_tlds: "Lista de domínios de nível superior que são tratados automaticamente como links"
+    markdown_typographer_quotation_marks: "Lista de pares de substituição de aspas simples e duplas"
     post_undo_action_window_mins: "Quantidade de minutos permitidos para que os(as) usuários(as desfaçam ações recentes em uma postagem (curtir, sinalizar, etc.)."
     must_approve_users: "A equipe deve aprovar novas contas de usuários(as) antes de receberem permissão para acessar o site."
+    invite_code: "O(a) deve digitar este código para poder cadastrar a conta, é ignorado quando vazio (diferencia maiúsculas de minúsculas)"
+    approve_suspect_users: "Adicione usuários(as) suspeitos(as) à fila de revisão. Usuários(as) suspeitos(as) inseriram um site/biografia, mas não têm atividade de leitura."
+    review_every_post: "Todas as postagens devem ser revisadas. AVISO! NÃO É RECOMENDADO PARA SITES CONGESTIONADOS."
+    pending_users_reminder_delay_minutes: "Notifique os moderadores se novos(as) usuários(as) estiverem aguardando aprovação por mais de alguns minutos. Defina como -1 para desativar as notificações."
+    persistent_sessions: "Os(as) usuários(as) permanecerão com a conta conectada ao fechar o navegador"
     maximum_session_age: "O(a) usuário(a) permanecerá com a conta conectada durante n horas desde o último acesso"
+    ga_version: "A versão do Google Universal Analytics para usar: v3 (analytics.js), v4 (gtag)"
+    ga_universal_tracking_code: "ID do código de monitoramento do Google Universal Analytics, por exemplo: UA-12345678-9; consulte <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
+    ga_universal_domain_name: "O nome de domínio do Google Universal Analytics, por exemplo: mysite.com; consulte <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
+    ga_universal_auto_link_domains: "Ative o monitoramento de domínio cruzado do Google Universal Analytics. Os links de saída para estes domínios conterão a ID de cliente. Consulte <a href='https://support.google.com/analytics/answer/1034342?hl=pt-BR' target='_blank'>Guia de acompanhamento de vários domínios do Google.</a>"
+    gtm_container_id: "ID do contêiner do Google Tag Manager. Por exemplo: GTM-ABCDEF. <br/>Observação: talvez os scripts de terceiros carregados pelo GTM precisem estar na lista de permissões no \"src de script de política de segurança de conteúdo\"."
     enable_escaped_fragments: "Voltar para a API do Google Ajax-Crawling se um webcrawler não for encontrado. Consulte <a href='https://developers.google.com/webmasters/ajax-crawling/docs/learn-more' target='_blank'>https://developers.google.com/webmasters/ajax-crawling/docs/learn-more</a>"
+    moderators_manage_categories_and_groups: "Permitir que moderadores(as) gerenciem grupos e categorias"
+    moderators_change_post_ownership: "Permitirem que moderadores(as) alterem a propriedade da postagem"
     cors_origins: "Origens permitidas para pedidos de origem cruzada (CORS). Cada origem deve incluir http:// ou https://. A variável de ambiente DISCOURSE_ENABLE_CORS deve ser definida como verdadeira para ativar CORS."
     use_admin_ip_allowlist: "Administradores(as) só podem entrar com a conta se estiverem na lista de IPs filtrados (Administração > Registros > IPs filtrados)."
     blocked_ip_blocks: "Uma lista de blocos de IP privados que nunca devem ser rastreados pelo Discourse"
     allowed_internal_hosts: "Uma lista de hosts internos que podem ser rastreados com segurança pelo Discourse para uma caixa e outros fins"
+    allowed_onebox_iframes: "Uma lista de domínios do iframe src permitidos via incorporações do Onebox. \"*\" permitirão todos os mecanismos padrão do Onebox."
     allowed_iframes: "Uma lista de prefixos de domínio iframe src que o Discourse pode permitir com segurança em postagens"
     allowed_crawler_user_agents: "Agentes de usuário(a) de rastreadores da web que devem ter permissão para acessar o site. AVISO! ESTA CONFIGURAÇÃO NEGARÁ ACESSO A TODOS OS RASTREADORES NÃO LISTADOS AQUI!"
+    blocked_crawler_user_agents: "Palavra sem diferenciação de maiúsculas e minúsculas na linha do agente do(a) usuário(a) que identifica os rastreadores da web que não devem ter permissão para acessar o site. Não se aplica se a lista de permissões estiver definida."
     slow_down_crawler_user_agents: "Agentes de usuário(a) de rastreadores da web que devem ter taxa limitada em robots.txt usando a diretiva de rastreamento atrasado"
     slow_down_crawler_rate: "Se slow_down_crawler_user_agents for especificado, essa taxa será aplicada a todos os rastreadores (quantidade de segundos de atraso entre os pedidos)"
     content_security_policy: "Ativar Content-Security-Policy"
     content_security_policy_report_only: "Ativar Content-Security-Policy-Report-Only"
     content_security_policy_collect_reports: "Ativar a coleta de relatórios de violação de CSP em /csp_reports"
+    content_security_policy_frame_ancestors: "Restrinja quem incorpora este site em iframes via CSP. Controle os hosts permitidos em <a href='%{base_path}/admin/customize/embedding'>Incorporação</a>"
+    content_security_policy_script_src: "Fontes de scripts adicionais na lista de permissões. O host e CDN atual estão inclusos por padrão. Consulte<a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>Mitigue ataques XSS com a política de segurança de conteúdo.</a>"
     invalidate_inactive_admin_email_after_days: "As contas de administrador(a) que não acessaram o site nesta quantidade de dias precisarão validar novamente seu endereço de e-mail antes de entrarem com a conta. Defina como 0 para desativar."
     top_menu: "Determine os items que aparecem ao navegar pela página inicial e em qual ordem. Por exemplo: mais recentes|novos|não lidos|categorias|melhores|lidos|postados|favoritos"
     post_menu: "Determine os itens e a ordem em que aparecem no menu de postagens. Por exemplo: curtir|editar|sinalizar|excluir|compartilhar|favorito|responder"
@@ -1339,6 +1544,7 @@ pt_BR:
     site_contact_group_name: "Um nome de grupo válido para ser convidado para todas as mensagens automáticas."
     send_welcome_message: "Envie aos(às) novos(as) usuários(as) uma mensagem de boas-vindas com um guia de início rápido."
     send_tl1_welcome_message: "Envie aos(às) novos(as) usuários(as) do nível de confiança 1 uma mensagem de boas-vindas."
+    send_tl2_promotion_message: "Envie a usuários(as) de nível de confiança 2 uma mensagem sobre promoção."
     suppress_reply_directly_below: "Não exiba a contagem de respostas expansível em um postagem quando há apenas uma única resposta direto abaixo desta postagem."
     suppress_reply_directly_above: "Não exiba a \"em resposta a\" expansível em uma postagem quando há apenas uma única resposta direto acima desta postagem."
     remove_full_quote: "Remova automaticamente citações completas nas respostas diretas."
@@ -1351,11 +1557,15 @@ pt_BR:
     moderators_view_emails: "Permitir que moderadores(as) visualizem e-mails de usuários(as)"
     prioritize_username_in_ux: "Mostrar primeiro o nome de usuário(a) na página do(a) usuário(a), cartão de usuário(a) e postagens (ao desativar, o nome será mostrado primeiro)"
     enable_rich_text_paste: "Ative a conversão automática de HTML para Markdown ao colar texto no compositor. (Experimental)"
+    send_old_credential_reminder_days: "Lembrar credenciais antigas após dias"
     email_token_valid_hours: "Tokens de Esqueceu a senha/ativar conta são válidos por (n) h."
     enable_badges: "Ativar o sistema de emblemas"
+    max_favorite_badges: "Quantidade máxima de emblemas que o(a) usuário(a) pode selecionar"
     enable_whispers: "Permitir a comunicação pessoal da equipe nos tópicos."
+    allow_index_in_robots_txt: "Especifique em robots.txt que este site tem permissão para ser indexado por mecanismos de busca da web. Em casos excepcionais, é possível <a href='%{base_path}/admin/customize/robots'>substituir robots.txt</a>."
     blocked_email_domains: "Lista delimitada por barras de domínios de e-mail que não são permitidos para registrar contas. Por exemplo: mailinator.com|trashmail.net"
     allowed_email_domains: "Lista delimitada por barras de domínios de e-mail que os(as) usuários(as) DEVEM usar para registrar contas. AVISO: usuários(as) com domínios de e-mail que não estão na lista não terão permissão!"
+    auto_approve_email_domains: "Os(as) usuários(as) com endereços de e-mail da lista de domínios serão aprovados automaticamente."
     hide_email_address_taken: "Não informe os(as) usuários(as) de que existe uma conta com um determinado endereço de e-mail durante o cadastro e o formulário de recuperação de senha."
     log_out_strict: "Ao sair com a conta, sair de TODAS as sessões do(a) usuário(a) em todos os dispositivos"
     version_checks: "Procurar na central do Discourse por atualizações de versão e exibir mensagens de nova versão no painel de controle <a href='%{base_path}/admin' target='_blank'>/admin</a>"
@@ -1366,12 +1576,33 @@ pt_BR:
     min_username_length: "Tamanho mínimo do nome do(a) usuário(a) em caracteres. AVISO: se algum usuário(a) ou grupo existente tiver nomes menores do que esse, seu site irá apresentar falhas!"
     max_username_length: "Tamanho máximo de nome do(a) usuário(a) em caracteres. VISO: se algum usuário(a) ou grupo existente tiver nomes maiores do que esse, seu site irá apresentar falhas!"
     unicode_usernames: "Permita nomes de usuários(a) e grupos contenham letras e números Unicode."
+    allowed_unicode_username_characters: "Expressão regular para permitir apenas alguns caracteres Unicode dentro de nomes de usuários(as). As letras e os números ASCII sempre serão permitidos e não precisam ser incluídos na lista de permissões."
     reserved_usernames: "Nomes de usuário(a) para os quais o cadastro não é permitido. O símbolo curinga * pode ser usado para corresponder a qualquer caractere zero ou mais vezes."
     min_password_length: "Tamanho mínimo da senha."
     min_admin_password_length: "Tamanho mínimo da senha para administradores(as)."
     password_unique_characters: "Quantidade mínima de caracteres únicos que uma senha deve ter."
     block_common_passwords: "Não permita senhas que estiverem entre as 10.000 senhas mais comuns."
+    auth_skip_create_confirm: Ao criar uma conta por um autenticador externo, pule o pop-up de criação de conta. É recomendável usar junto com auth_overrides_email, auth_overrides_username e auth_overrides_name.
+    auth_immediately: "Redirecione automaticamente para o sistema de entrada com conta externo sem a interação do(a) usuário(a). Isso se aplica apenas quando login_required for verdadeiro e houver apenas um método de autenticação externo"
+    enable_discourse_connect: "Ativar a criação de conta via DiscourseConnect (anteriormente \"Discourse SS\") (ALERTA: OS ENDEREÇOS DE E-MAL DOS(AS) USUÁRIOS(AS) *DEVEM* SER VALIDADOS PELO SITE EXTERNO!)"
+    verbose_discourse_connect_logging: "Registrar diagnósticos detalhados relacionados ao DiscourseConnec em <a href='%{base_path}/logs' target='_blank'>/logs</a>"
+    enable_discourse_connect_provider: "Implementar o protocolo de provedor do DiscourseConnect (anteriormente \"Discourse SSO\") no ponto de extremidade /session/sso_provider, requer que o discourse_connect_provider_secrets seja definido"
+    discourse_connect_url: "URL do ponto de extremidade do DiscourseConnect (deve incluir http:// ou https://)"
+    discourse_connect_secret: "Linha secreta usada para autenticar com criptografia as informações do DiscourseConnect, verifique se tem mais de dez caracteres"
+    discourse_connect_provider_secrets: "Uma lista de pares de segredos de domínio que usam o Discourse. Verifique se o segredo do DiscourseConnect tem pelo menos dez caracteres. O símbolo de curinga * pode ser usado para fazer correspondência com domínios ou partes deles (por exemplo: *.example.com)."
     discourse_connect_overrides_bio: "Sobrescreve a biografia do(a) usuário(a) e o(a) impede de mudá-la."
+    discourse_connect_overrides_groups: "Sincronize todos os membros do grupo manual com grupos especificados no atributo dos grupos (ATENÇÃO: se você não especificar grupos, todos os membros do grupo manual serão removidos para o(a) usuário(a))"
+    auth_overrides_email: "Substitui o e-mail local pelo e-mail de algum site externo a cada vez que entrar com a conta, além de impedir alterações locais. Isso se aplica a todos os provedores de autenticação (AVISO: podem ocorrer diferenças devido à normalização de e-mails locais)"
+    auth_overrides_username: "Substitui o nome do(a) usuário(a) local pelo nome do(a) usuário(a) de algum site externo a cada vez que entrar com a conta, além de impedir alterações locais. Isso se aplica a todos os provedores de autenticação (AVISO: podem ocorrer diferenças devido ao tamanho/requisitos do nome do(a) usuário(a))"
+    auth_overrides_name: "Substitui o nome completo local pelo nome completo de algum site externo a cada vez que entrar com a conta, além de impedir alterações locais. Isso se aplica a todos os provedores de autenticação."
+    discourse_connect_overrides_avatar: "Substitui o avatar do(a) usuário(a) pelo valor do conteúdo do DiscourseConnect. Se for ativado, os(as) usuários(as) não terão permissão para enviar avatares no Discourse."
+    discourse_connect_overrides_location: "Substitui a localização do(a) usuário(a) pelo valor do conteúdo do DiscourseConnect e impede alterações locais."
+    discourse_connect_overrides_website: "Substitui o site do(a) usuário(a) pelo valor do conteúdo do DiscourseConnect e impede alterações locais."
+    discourse_connect_overrides_profile_background: "Substitui o plano de fundo do perfil do(a) usuário(a) pelo valor do conteúdo do DiscourseConnect."
+    discourse_connect_overrides_card_background: "Substitui o plano de fundo do cartão de usuário(a) pelo valor do conteúdo do DiscourseConnect."
+    discourse_connect_not_approved_url: "Redireciona contas não aprovadas do DiscourseConnect para esta URL"
+    discourse_connect_allows_all_return_paths: "Não restrinja o domínio para return_paths fornecidos pelo DiscourseConnect (por padrão, o caminho de retorno deve estar no site atual)"
+    enable_local_logins: "Ative contas baseadas em entrada com senha e usuário(a) local. ALERTA: se estiver desativado, talvez não seja possível entrar com a conta caso você não tenha configurado pelo menos um método de entrada alternativo."
     enable_local_logins_via_email: "Permita que os(as) usuários(as) solicitem um link para entrar com um clique para ser enviado por e-mail."
     allow_new_registrations: "Permita cadastro de novos(as) usuários(as). Desmarque isso para evitar que qualquer pessoa crie uma nova conta."
     enable_signup_cta: "Exiba um aviso aos(as) usuários(as) anônimos(as) que voltaram ao solicitar que criem uma conta."
@@ -1384,15 +1615,24 @@ pt_BR:
     twitter_consumer_key: "Chave do(a) consumidor(a) para autenticação do Twitter, registrada em <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
     twitter_consumer_secret: "Segredo do(a) consumidor(a) para autenticação do Twitter, registrado em <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
     enable_facebook_logins: "Ative a autenticação do Facebook, requer facebook_app_id e facebook_app_secret. Consulte <a href='https://meta.discourse.org/t/13394' target='_blank'>Configurando a entrada com conta do Facebook para o Discourse</a>."
+    facebook_app_id: "ID do app para compartilhamento e autenticaçao do Facebook, registrado em <a href='https://developers.facebook.com/apps/' target='_blank'>https://developers.facebook.com/apps</a>"
     facebook_app_secret: "Segredo do aplicativo para autenticação do Facebook, registrado em <a href='https://developers.facebook.com/apps/' target='_blank'>https://developers.facebook.com/apps</a>"
+    enable_github_logins: "Ative a autenticação do GitHub, requer github_client_id and github_client_secret. Consulte <a href='https://meta.discourse.org/t/13745' target='_blank'>Configurando a entrada com conta do GitHub para o Discourse</a>."
+    github_client_id: "ID do cliente para autenticação do GitHub, registrado em <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
+    github_client_secret: "Segredo do cliente para autenticação do GitHub, registrado em <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
+    enable_discord_logins: "Permitir que os(as) usuários(as) façam autenticação via Discord?"
+    discord_client_id: 'ID do cliente Discord (precisa de uma? acesse <a href="https://discordapp.com/developers/applications/me">o portal do desenvolvedor Discord</a>)'
     discord_secret: "Chave secreta do Discord"
+    discord_trusted_guilds: 'Permita que apenas membros destas guildas do Discord entrem com a conta via Discord. Use a ID numérica para a guilda. Para obter mais informações, confira as instruções <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">aqui</a>. Deixe em branco para permitir qualquer guilda.'
     enable_backups: "Permitir que administradores(as) criem backups do fórum"
+    allow_restore: "Dar permissão para restauração, que pode substituir TODOS os dados do site! Mantenha desativado a menos que planeje restaurar um backup"
     maximum_backups: "A quantidade máxima de backups para manter no disco. Backups mais antigos são excluídos automaticamente"
     automatic_backups_enabled: "Realizar backups automáticos, como definido na frequência de backup"
     backup_frequency: "A quantidade de dias entre os backups."
     s3_backup_bucket: "O bucket remoto para realizar backups. AVISO: verifique se é um bucket privado."
     s3_endpoint: "O ponto de extremindade pode ser modificado para fazer backup em um serviço compatível com S3, como DigitalOcean Spaces ou Minio. AVISO: deixe em branco se estiver usando o AWS S3."
     s3_configure_tombstone_policy: "Ative a política de exclusão automática para envios de marca de exclusão. IMPORTANTE: Se for desativado, nenhum espaço será recuperado depois que os envios forem excluídos."
+    s3_disable_cleanup: "Evite remover backups antigos do S3 quando houver mais backups do que o máximo permitido."
     enable_s3_inventory: "Gere relatórios e verifique os envios usando o inventário do Amazon S3. IMPORTANTE: requer credenciais S3 válidas (ID da chave de acesso e chave de acesso secreta)."
     backup_time_of_day: "Hora do dia, em UTC, em que o backup deve ocorrer."
     backup_with_uploads: "Inclua envios nos backups programados. Desative para copiar apenas a base de dados."
@@ -1415,12 +1655,18 @@ pt_BR:
     max_bookmarks_per_day: "Quantidade máxima de favoritos por usuário(a) a cada dia."
     max_edits_per_day: "Quantidade máxima de edições que o(a) usuário(a) pode fazer a cada dia."
     max_topics_per_day: "Quantidade máxima de postagens que um(a) usuário(a) pode criar a cada dia."
+    max_personal_messages_per_day: "Quantidade máxima de novos tópicos de mensagens pessoais que um(a) usuário(a) pode criar a cada dia."
     max_invites_per_day: "Quantidade máxima de convites que um(a) usuário(a) pode enviar por dia."
     max_topic_invitations_per_day: "Quantidade máxima de convites para tópicos que um(a) usuário(a) pode enviar por dia."
     max_logins_per_ip_per_hour: "Quantidade máxima de entradas com a conta permitidas por endereço IP a cada hora"
     max_logins_per_ip_per_minute: "Quantidade máxima de entradas com a conta permitidas por endereço IP a cada minuto"
+    max_post_deletions_per_minute: "Quantidade máxima de postagens que um(a) usuário(a) pode excluir por minuto. Defina como 0 para desativar exclusões de postagens."
+    max_post_deletions_per_day: "Quantidade máxima de postagens que um(a) usuário(a) pode excluir por dia. Defina como 0 para desativar exclusões de postagens."
+    invite_link_max_redemptions_limit: "A quantidade máxima de resgates de links de convite não pode exceder este valor."
+    invite_link_max_redemptions_limit_users: "A quantidade máxima de resgates de links de convite gerados por usuário(a) não pode exceder este valor."
     alert_admins_if_errors_per_minute: "Quantidade de erros por minuto para acionar um alerta à administração. Um valor igual a 0 desativa esse recurso. OBSERVAÇÃO: requer reinicialização."
     alert_admins_if_errors_per_hour: "Quantidade de erros por hora para acionar um alerta à administração. Um valor igual a 0 desativa esse recurso. OBSERVAÇÃO: requer reinicialização."
+    categories_topics: "Quantidade de tópicos para exibir na página /categorias. Se definido como 0, será realizada uma tentativa de encontrar um valor para manter as duas colunas simétricas (tópicos e categorias)."
     suggested_topics: "Quantidade de tópicos sugeridos exibidos no final de um tópico."
     limit_suggested_to_category: "Exiba apenas tópicos da categoria atual nos tópicos sugeridos."
     suggested_topics_max_days_old: "Tópicos sugeridos não devem ter mais de n dia(s)."
@@ -1439,13 +1685,22 @@ pt_BR:
     avatar_sizes: "Lista de tamanhos de avatares gerados automaticamente."
     external_system_avatars_enabled: "Usar serviço de avatares de sistema externo."
     external_system_avatars_url: "URL do sistema externo do serviço de avatares. Substituições permitidas são {username} {first_letter} {color} {size}"
+    external_emoji_url: "URL do serviço externo para imagens de emoji. Deixe em branco para desativar."
+    use_site_small_logo_as_system_avatar: "Use o logotipo pequeno do site em vez do avatar do(a) usuário(a) do sistema. Requer que o logo esteja presente."
     restrict_letter_avatar_colors: "Uma lista de valores de cor hexadecimais de 6 dígitos para serem usados no plano de fundo do avatar da letra."
     selectable_avatars_enabled: "Obrigue os(as) usuários(as) a escolher um avatar da lista."
     selectable_avatars: "Lista de avatares que os(as) usuários(as) podem escolher."
     allow_all_attachments_for_group_messages: "Permitir todos os anexos de e-mail para mensagens de grupo."
     png_to_jpg_quality: "Qualidade do arquivo JPG convertido (1 é a qualidade mais baixa, 99 é a melhor qualidade, 100 para desativar)."
+    recompress_original_jpg_quality: "Qualidade dos arquivos de imagem carregados (1 é a qualidade mais baixa, 99 é a melhor, 100 desativa)."
+    image_preview_jpg_quality: "Qualidade dos arquivos de imagem redimensionados (1 é a qualidade mais baixa, 99 é a melhor, 100 desativa)."
     allow_staff_to_upload_any_file_in_pm: "Permita que membros da equipe enviem de arquivos em MP."
     strip_image_metadata: "Retire os metadados da imagem."
+    composer_media_optimization_image_enabled: "Ativa otimização de mídias do lado do cliente para arquivos de imagem carregados."
+    composer_media_optimization_image_bytes_optimization_threshold: "Tamanho mínimo de imagem para acionar a otimização do lado do cliente"
+    composer_media_optimization_image_resize_dimensions_threshold: "Largura de imagem mínima para acionar o redimensionamento do lado do cliente"
+    composer_media_optimization_image_resize_width_target: "Imagens com larguas maiores do que \"composer_media_optimization_image_dimensions_resize_threshold\" serão redimensionadas para esta largura. Deve ser >= do que \"composer_media_optimization_image_dimensions_resize_threshold\"."
+    composer_media_optimization_image_encode_quality: "Qualidade de codificação de JPG usada no processo de recodificação."
     min_ratio_to_crop: "Taxa usada para cortar imagens altas. Digite o resultado da largura/altura."
     simultaneous_uploads: "Quantidade máxima de arquivos que podem ser arrastados e soltos no compositor"
     default_invitee_trust_level: "Nível de confiança (0-4) padrão para usuários(as) convidados(as)."
@@ -1481,11 +1736,17 @@ pt_BR:
     min_trust_to_edit_post: "O nível mínimo de confiança necessário para editar postagens."
     min_trust_to_allow_self_wiki: "O nível de confiança mínimo necessário para criar o próprio wiki do(a) usuário(a)."
     min_trust_to_send_messages: "O nível de confiança mínimo necessário para criar novas mensagens pessoais."
+    min_trust_to_send_email_messages: "O nível mínimo de confiança necessário para enviar mensagens pessoais via e-mail."
     min_trust_to_flag_posts: "O nível de confiança mínimo necessário para sinalizar postagens"
     min_trust_to_post_links: "O nível de confiança mínimo necessário para incluir links em postagens"
+    min_trust_to_post_embedded_media: "O nível de confiança mínimo necessário para incorporar itens de mídia em uma postagem"
+    min_trust_level_to_allow_profile_background: "O nível de confiança mínimo necessário par a enviar um plano de fundo para perfil"
+    min_trust_level_to_allow_user_card_background: "O nível de confiança mínimo necessário par a enviar um plano de fundo para cartão de usuário(a)"
     min_trust_level_to_allow_invite: "O nível de confiança mínimo necessário para convidar usuários(as)"
+    min_trust_level_to_allow_ignore: "O nível de confiança mínimo necessário para ignorar usuários(as)"
     allowed_link_domains: "Domínios aos quais os(as) usuários(as) podem vincular, mesmo que não tenham o nível de confiança apropriado para postar links"
     newuser_max_links: "Quantos links um(a) usuário(a) novo(a) pode adicionar a uma postagem."
+    newuser_max_embedded_media: "Quantidade de itens de mídia incorporados que um(a) novo(a) usuário(a) pode adicionar a uma postagem."
     newuser_max_attachments: "Quantos arquivos anexos um(a) usuário(a) novo(a) pode adicionar a uma postagem."
     newuser_max_mentions_per_post: "Quantidade máxima de notificações @nome que um(a) usuário(a) novo(a) pode usar em uma postagem."
     newuser_max_replies_per_topic: "Quantidade máxima de respostas que um(a) usuário(a) novo(a) pode fazer em um único tópico até que alguém os responda."
@@ -1502,17 +1763,21 @@ pt_BR:
     body_min_entropy: "A entropia mínima (caracteres únicos e em idioma diferente do inglês contam mais) necessária para o corpo de uma postagem."
     allow_uppercase_posts: "Permita toda as letras maiúsculas no título de um tópico ou no corpo de uma postagem."
     max_consecutive_replies: "Quantidade de postagens que um(a) usuário(a) precisa fazer de uma vez em um tópico antes de ser impedido(a) de adicionar outra resposta."
+    enable_filtered_replies_view: 'o botão "(n) respostas" recolhe todas as outras postagens e exibe apenas a postagem atual e suas respostas.'
     title_fancy_entities: "Converter caracteres ASCII comuns para criar entidades HTML em títulos de tópicos, consulte SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "O tamanho mínimo de um título antes que seja verificado para tópicos semelhantes."
     desktop_category_page_style: "Estilo de visual para a página/categorias."
     category_colors: "Uma lista de valores hexadecimais de cor permitidos para categorias."
     category_style: "Estilo de visual para emblemas de categoria."
+    default_dark_mode_color_scheme_id: "O esquema de cores usado no modo escuro."
     dark_mode_none: "Nenhum"
+    max_image_size_kb: "O tamanho de envio de imagem máximo em KB. Isso deve ser configurado em nginx (client_max_body_size)/apache ou proxy também. Imagens maiores do que esta e menores do que client_max_body_size serão redimensionadas para o tamanho do envio."
     max_attachment_size_kb: "O tamanho máximo de envio de arquivos anexos em kB. Precisa ser configurado no nginx (client_max_body_size)/apache ou proxy também."
     authorized_extensions: "Uma lista de extensões de arquivo permitidas para envio (use '*' para permitir todos os tipos de arquivos)"
     authorized_extensions_for_staff: "Uma lista de extensões de arquivo permitidas para enviar aos usuários(as) da equipe, além da lista definida na configuração do site \"authorized_extensions\". (use '*' para ativar todos os tipos de arquivo)"
     theme_authorized_extensions: "Uma lista de extensões de arquivo permitidas para envio de temas (use '*' para ativar todos os tipos de arquivos)"
     max_similar_results: "Quantidade de tópicos semelhantes para exibir acima do editor ao compor um novo tópico. A comparação é baseada no título e no corpo."
+    max_image_megapixels: "A quantidade máxima de megapixels permitidos para uma imagem. Imagens com uma quantidade maior de megapixels serão recusadas."
     title_prettify: "Evite erros comuns em títulos, incluindo tecla caps lock ligada, primeira letra minúscula, excesso de ! e ?, pontos extras no final, etc."
     title_remove_extraneous_space: "Remova os espaços em branco iniciais à frente da pontuação final."
     automatic_topic_heat_values: 'Atualize automaticamente as configurações "volume de visualizações do tópico" e "volume de curtidas de postagens no tópico" com base na atividade do site.'
@@ -1534,6 +1799,7 @@ pt_BR:
     log_anonymizer_details: "Se deseja manter os detalhes de um(a) usuário(a) no registro depois de ser se tornar anônimo(a). Ao estar em conformidade com o GDPR, será preciso desativá-lo."
     newuser_spam_host_threshold: "Quantidade de vezes que um(a) novo(a) usuário(a) pode postar um link para o mesmo host em suas postagens \"newuser_spam_host_threshold\" antes de ser considerado spam."
     allowed_spam_host_domains: "Uma lista de domínios excluídos do teste de spam. Usuários(as) novos(as) nunca serão restringidos(as) de criar postagens com links para esses domínios."
+    staff_like_weight: "Peso dado às curtidas da equipe (curtidas de membros fora da equipe têm o peso de 1)."
     topic_view_duration_hours: "Conte uma nova visualização de tópico uma vez por IP/usuário(a) a cada N horas"
     user_profile_view_duration_hours: "Conte uma nova visualização de perfil de usuário(a) uma vez por IP/usuário(a) a cada N horas"
     levenshtein_distance_spammer_emails: "Ao fazer correspondência de e-mails de remetentes de spam, o tamanho da diferença de caracteres que ainda causará uma correspondência aproximada."
@@ -1547,9 +1813,14 @@ pt_BR:
     min_first_post_typing_time: "Quantidade mínima de tempo, em milissegundos, que o(a) usuário(a) deve passar digitando durante a primeira postagem. Se o limite não for atingido, a postagem entrará automaticamente na fila de aprovação necessária. Defina como 0 para desativar (não recomendado)"
     auto_silence_fast_typers_on_first_post: "Silenciar automaticamente usuários(as) que não atendem a min_first_post_typing_time"
     auto_silence_fast_typers_max_trust_level: "Nível máximo de confiança para silenciar automaticamente usuários(as) que digitam rápido"
+    auto_silence_first_post_regex: "Regex sem diferenciação de maiúsculas ou minúsculas que, caso em caso de aprovação, farão que a primeira postagem de um(a) usuário(a) seja silenciada e enviada para a fila de aprovação. Por exemplo: raging|a[bc]a silenciará todas as postagens contendo raging ou aba, ou aca, imediatamente. Isso se aplica apenas à primeira postagem. PRETERIDO: use Silenciar palavras acompanhadas."
     reviewable_claiming: "O conteúdo revisável precisa ser reivindicado antes que possa ser aplicado?"
     reviewable_default_topics: "Mostrar conteúdo revisável agrupado por tópico por padrão"
     reviewable_default_visibility: "Não mostrar itens revisáveis, a menos que atendam a esta prioridade"
+    reviewable_low_priority_threshold: "O filtro de prioridade oculta itens revisáveis que não atendem a esta pontuação a menos que o filtro \"(qualquer)\" seja usado."
+    high_trust_flaggers_auto_hide_posts: "Novas postagens de usuários(as) são ocultas automaticamente após serem sinalizadas como spam por um(a) usuário(a) TL3+"
+    cooldown_hours_until_reflag: "Quantidade de tempo que os(as) usuários(as) terão que aguardar até poderem sinalizar postagem outra vez"
+    slow_mode_prevents_editing: "O \"modo lento\" evita a edição após editing_grace_period?"
     reply_by_email_enabled: "Ative resposta a tópicos via e-mail"
     reply_by_email_address: "Modelo de resposta por e-mail, por exemplo: %%{reply_key}@reply.example.com or replies+%%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "Lista de modelos alternativos para responder por e-mail a endereços de e-mail recebidos. Por exemplo:%%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
@@ -1574,9 +1845,17 @@ pt_BR:
     hard_bounce_score: "Pontuação de rejeição adicionada ao(à) usuário(a) quando ocorre uma devolução permanente."
     bounce_score_threshold: "Pontuação máxima de devolução antes de pararmos de enviar um email a um(a) usuário(a)."
     reset_bounce_score_after_days: "Redefinir automaticamente a pontuação de devolução após X dias."
+    blocked_attachment_content_types: "Lista de palavras-chave usadas para adicionar anexos à lista de bloqueio com base no tipo de conteúdo."
+    blocked_attachment_filenames: "Lista de palavras-chave usadas para adicionar anexos à lista de bloqueio com base no nome do arquivo."
+    forwarded_emails_behaviour: "Como tratar um e-mail encaminhado para o Discourse"
     always_show_trimmed_content: "Sempre exiba a parte cortada dos e-mails recebidos. AVISO: pode revelar endereços de e-mail."
     trim_incoming_emails: "Cortar parte dos e-mails recebidos que não são relevantes."
     private_email: "Não inclua o conteúdo de postagens ou tópicos no título ou corpo do e-mail. OBSERVAÇÃO: também desativa e-mails de compilação."
+    email_total_attachment_size_limit_kb: "Tamanho máximo total dos arquivos anexados aos e-mail enviados, em KB. Defina como 0 para desativar o envio de anexos."
+    post_excerpts_in_emails: "Nos e-mails de notificação, sempre enviar trechos em vez de postagens completas"
+    raw_email_max_length: "Quantidade de caracteres que devem ser armazenados para e-mails recebidos."
+    raw_rejected_email_max_length: "Quantidade de caracteres que devem ser armazenados para e-mails rejeitados."
+    delete_rejected_email_after_days: "Exclua rascunhos recusado anteriores a (n) dias."
     manual_polling_enabled: "Envie e-mails usando a API para respostas via e-mail."
     pop3_polling_enabled: "Sondar via POP3 para respostas de e-mail."
     pop3_polling_ssl: "Use SSL ao conectar-se com o servidor POP3. (Recomendado)"
@@ -1590,7 +1869,16 @@ pt_BR:
     log_mail_processing_failures: "Registrar todas as falhas de processamento de e-mail em <a href='%{base_path}/logs' target='_blank'>/logs</a>"
     email_in: 'Permita que os(as) usuários(as) postem novos tópicos por e-mail (requer sondagem manual ou POP3). Configure os endereços na aba "Configurações" de cada categoria.'
     email_in_min_trust: "O nível de confiança mínimo que um(a) usuário(a) precisa ter para ter permissão para postar novos tópicos via e-mail."
+    email_in_authserv_id: "O identificador do serviço realizando verificações de autenticação em e-mails recebidos. Confira <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> para obter instruções de como configurar isso."
     email_in_spam_header: "O cabeçalho do e-mail para detectar spam."
+    enable_imap: "Ative IMAP para sincronizar mensagens de grupo."
+    enable_imap_write: "Ative sincronização de dois fatores IMAP. Se desativado, desativa todas as operações de escrita para contas IMAP."
+    enable_imap_idle: "Use o mecanismo IMAP IDLE para aguardar novos e-mails."
+    enable_smtp: "Ative SMTP para enviar notificações de mensagens de grupo."
+    imap_polling_period_mins: "O período em minutos entre a conferência de contas IMAP para e-mails."
+    imap_polling_old_emails: "A quantidade máxima de e-mails antigos (processados) a serem enviados sempre que uma caixa IMAP for sondada (0 para todos)."
+    imap_polling_new_emails: "A quantidade máxima de e-mails novos (não processados) a serem enviados sempre que uma caixa IMAP for sondada."
+    imap_batch_import_email: "A quantidade mínima de novos e-mails que acionam o modo de importação (desativa alertas de postagem)."
     email_prefix: "A [label] usada no assunto dos e-mails. Por padrão, será \"título\" se não for configurada."
     email_site_title: "O título do site usado como o remetente dos e-mails do site. Por padrão, será \"título' se não for configurado. Caso seu \"título\" contenha caracteres não permitidos em linhas do remetente de e-mails, utilize esta configuração."
     find_related_post_with_key: "Use somente a \"chave de resposta\" para encontrar a postagem respondida. AVISO: desativar isso permite a representação do usuário(a) com base no endereço de e-mail."
@@ -1598,6 +1886,7 @@ pt_BR:
     relative_date_duration: "Quantidade de dias após postar em que as datas de postagem serão exibidas como relativas (7 d) em vez de absolutas (20 de fev.)."
     delete_user_max_post_age: "Não permitir a exclusão de usuários(as) cuja primeira postagem seja mais antiga do que (x) dias."
     delete_all_posts_max: "Quantidade máxima de postagens que podem ser excluídas de uma vez com o botão Remover todas as postages. Se um(a) usuário(a) tiver mais postagens do que essa quantidade, elas não poderão ser excluídas(as) de uma vez e o(a) usuário(a) não poderá ser excluído(a)."
+    delete_user_self_max_post_count: "A quantidade máxima de postagens que um(a) usuário(a) pode ter ao permitir a exclusão da conta de autoatendimento. Defina como 1 para desativar a exclusão da conta do serviço."
     username_change_period: "A quantidade máxima de dias após o registro em que as contas podem alterar seu nome do(a) usuário(a) (0 para não permitir a mudança de nome do(a) usuário(a))."
     email_editable: "Permita que os(as) usuários(as) alterem o seu endereço de e-mail após o cadastro."
     logout_redirect: "Local para o qual redirecionar o navegador após sair (por exemplo: https://example.com/logout)"
@@ -1611,6 +1900,7 @@ pt_BR:
     suppress_digest_email_after_days: "Bloqueie e-mails de resumo para usuários(as) não vistos(as) no site por mais de (n) dias."
     digest_suppress_categories: "Bloqueie estas categorias dos e-mails de resumo."
     disable_digest_emails: "Desative e-mails de resumo para todos os(as) usuários(as)."
+    apply_custom_styles_to_digest: "Modelo de e-mail personalizado e css aplicados ao resumo de e-mails."
     email_accent_bg_color: "A cor de destaque para usar como plano de fundo de alguns elementos em e-mails HTML. Digite o nome de uma cor (\"vermelho\") ou valor hexadecimal (\"# FF0000\")."
     email_accent_fg_color: "A cor do texto renderizado na cor de fundo de e-mail em e-mails HTML. Digite o nome de uma cor (\"branco\") ou valor hexadecimal (\"#FFFFFF\")."
     email_link_color: "A cor dos links em e-mails HTML. Digite o nome de uma cor (\"azul\") ou valor hexadecimal (\"#0000FF\")."
@@ -1620,17 +1910,23 @@ pt_BR:
     staff_user_custom_fields: "Uma lista de campos personalizados do(a) usuário(a) que podem ser recuperados para membros da equipe com a API."
     enable_user_directory: "Fornecer um diretório de usuários(as) para navegar"
     enable_group_directory: "Fornecer um diretório de grupos para navegação"
+    enable_category_group_moderation: "Permitir que grupos moderem conteúdo em categorias específicas"
     group_in_subject: "Definir %%{optional_pm} o assunto de e-mail como o nome do primeiro grupo em PM, consulte: <a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>Personalizar formato de assunto para e-mails padrão</a>"
     allow_anonymous_posting: "Permitir que usuários(as) quem para modo anônimo(a)"
     anonymous_posting_min_trust_level: "Nível de confiança mínimo necessário para ativar mensagens anônimas"
     anonymous_account_duration_minutes: "Para proteger o anonimato, crie uma conta anônima a cada N minutos para cada usuário(a). Exemplo: se for configurado para 600, assim que passar 600 minutos a partir da última postagen E o(a) usuário(a) trocar para anônimo(a), uma nova conta anônima será criada."
     hide_user_profiles_from_public: "Desative cartões de usuário(a), perfis de usuário(a) e diretório do(a) usuário(a) para usuários(as) anônimos(as)."
+    allow_users_to_hide_profile: "Permitir que usuários ocultem seu perfil e presença"
+    allow_featured_topic_on_user_profiles: "Permitir que usuários apresentem o link de um tópico em seu cartão de usuário(a) e perfil."
     show_inactive_accounts: "Permitir que usuários(as) conectados(as) naveguem em perfis de contas inativas."
     hide_suspension_reasons: "Não exiba razões de suspensão publicamente nos perfis de usuário(a)."
     log_personal_messages_views: "Registre visualizações de mensagens pessoais do(a) administrador(a) para outros(as) usuários(as)/grupos."
     ignored_users_count_message_threshold: "Notifique moderadores(as) se um(a) usuário(a) específico(a) for ignorado(a) por muitos(as) outros(as) usuários(as)."
     ignored_users_message_gap_days: "Quanto tempo esperar antes de notificar novamente moderadores(as) sobre um(a) usuário(a) que foi ignorado(a) por muitos(as) outros(as)."
     clean_up_inactive_users_after_days: "Quantidade de dias antes de um(a) usuário(a) inativo(a) (nível de confiança 0 sem nenhuma postagem) ser removido(a). Para desativar a limpeza, defina para 0."
+    clean_up_unused_staged_users_after_days: "Quantidade de dias antes de um(a) usuário(a) encenado(a) não usado(a) (sem nenhuma postagem) ser removido(a). Para desativar a limpeza, defina para 0."
+    user_selected_primary_groups: "Permitir que os(as) usuários(as) definam seu próprio grupo primário"
+    max_notifications_per_user: "Quantidade máxima de notificações por usuário(a). Se esse número for excedido, as notificações antigas serão excluídas. Aplicado semanalmente."
     allowed_user_website_domains: "O site do(a) usuário(a) será verificado em comparação a estes domínios. Lista delimitada por barras."
     allow_profile_backgrounds: "Permita que os(as) usuários(as) enviem planos de fundo do perfil."
     sequential_replies_threshold: "Quantidade de postagens que um(a) usuário(a) precisa fazer em uma linha de um tópico antes de ser lembrado(a) de muitas respostas em sequência."
@@ -1643,12 +1939,18 @@ pt_BR:
     permalink_normalizations: "Aplique o seguinte regex antes de combinar permalinks, por exemplo: /(topic.*)\\?.*/\\1 irá retirar as linhas de consulta das rotas de tópicos. O formato é regex + string use \\ 1 etc. para acessar capturas"
     global_notice: "Exibir um aviso global em banner URGENTE, EMERGENCIAL e que não pode ser fechado para todos os visitantes, deixe em branco para ocultá-lo (permitido por HTML)."
     disable_system_edit_notifications: "Desative a edição de notificações do(a) usuário(a) do sistema quando \"download_remote_images_to_local\" estiver ativado."
+    notification_consolidation_threshold: "Quantidade de notificações de pedidos de associação ou curtidas recebidas antes que as notificações sejam agrupadas. Defina como 0 para desativar."
+    likes_notification_consolidation_window_mins: "Duração em minutos durante a qual as notificações curtidas são agrupadas em uma notificação única após alcançar o limite. É possível configurar o limite acessando \"SiteSetting.notification_consolidation_threshold\"."
     automatically_unpin_topics: "Desafixe automaticamente os tópicos quando o(a) usuário(a) atinge à parte inferior."
     read_time_word_count: "Contagem de palavras por minuto para calcular o tempo estimado de leitura."
+    topic_page_title_includes_category: "Página do tópico <a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>etiqueta do título</a> inclui o nome da categoria."
     native_app_install_banner_ios: "Exibir o banner do aplicativo DiscourseHub em dispositivos iOS para usuários(as) regulares (nível de confiança 1 e superior)."
     native_app_install_banner_android: "Exibir o banner do aplicativo DiscourseHub em dispositivos Android para usuários(as) regulares (nível de confiança 1 e superior)."
+    app_association_android: "Conteúdos do ponto de extremidade <a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a>, usado para a API Digital Asset Links, do Google."
+    app_association_ios: "Conteúdo do ponto de extremidade <a href='%{base_path}/apple-app-site-association'>apple-app-site-association</a>, usado par criar links universais entre este site e apps para iOS."
     share_anonymized_statistics: "Compartilhe estatísticas de uso anônimas."
     auto_handle_queued_age: "Trate automaticamente os registros que estão aguardando revisão há vários dias. Sinalizadores serão ignorados. Postagens na fila e usuários serão rejeitados. Defina como 0 para desativar esse recurso."
+    penalty_step_hours: "Penalidades padrão por silenciar ou suspender usuários(as). A primeira ofensa é padronizada para o primeiro valor, a segunda ofensa para o segundo valor, etc."
     svg_icon_subset: "Adicione mais ícones FontAwesome 5 que você gostaria de incluir em seus ativos. Use o prefixo \"fa-\" para ícones consolidados, \"far-\" para ícones regulares e \"fab-\" para ícones de marca."
     max_prints_per_hour_per_user: "Quantidade máxima de impressões de páginas (defina como 0 para desativar)"
     full_name_required: "O nome completo é um campo obrigatório do perfil do(a) usuário(a)."
@@ -1656,10 +1958,16 @@ pt_BR:
     display_name_on_posts: "Exibir o nome completo do(a) usuário(a) em suas postagens, além de seu(sua) @username."
     show_time_gap_days: "Se duas postagens forem feitas com tantos dias de intervalo, mostre o intervalo de tempo no tópico."
     short_progress_text_threshold: "Após a quantidade de mensagens em um tópico ultrapassar este número, a barra de progresso exibirá apenas o número da postagem atual. Se você alterar a largura da barra de progresso, talvez seja necessário alterar este valor."
+    default_code_lang: "Realce de sintaxe de linguagem de programação padrão aplicada aos blocos de código do GitHub (automático, sem destaque, rubi, python, etc.)"
     warn_reviving_old_topic_age: "Quando alguém começa a responder a um tópico anterior a esta quantidade de dias, um aviso será exibido. Desative ao definir como 0."
     autohighlight_all_code: "Aplicar código destacando todos os blocos de código pré-formatados, mesmo quando não especificarem o idioma"
     highlighted_languages: "Regras de destaque de sintaxe incluídas. (Atenção: incluir muitos idiomas pode afetar o desempenho) consulte: <a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a> para ver uma demonstração"
+    show_copy_button_on_codeblocks: "Adicione um botão ao Codeblocks para copiar o conteúdo do bloco para a área de transferência do(a) usuário(a). Este recurso não é compatível com o Internet Explorer."
+    embed_any_origin: "Permita um conteúdo incorporado, seja qual for a origem. Isso é necessário para apps móveis com HTML estático."
+    embed_topics_list: "Compatível com incorporação HTML de listas de tópicos"
+    embed_set_canonical_url: "Defina a URL canônica de tópicos incorporados para a URL do conteúdo incorporado."
     embed_truncate: "Trunque as postagens incorporadas."
+    embed_unlisted: "Tópicos importados serão removidos da lista até um(a) usuário(a) responder."
     embed_support_markdown: "Compatível com formatação de Markdown para postagens incorporadas."
     allowed_embed_selectors: "Uma lista de elementos CSS separados por vírgula permitidos em incorporações."
     allowed_href_schemes: "Esquemas permitidos em links, além de http e https."
@@ -1668,7 +1976,12 @@ pt_BR:
     notify_about_flags_after: "Se houver sinalizadores que não foram tratados depois de muitas horas, envie uma mensagem pessoal para os(as) moderadores(as). Defina como 0 para desativar."
     show_create_topics_notice: "Se o site tiver menos de cinco tópicos públicos, mostre um aviso pedindo que os(as) administradores(as) criem alguns tópicos."
     delete_drafts_older_than_n_days: "Exclua rascunhos anteriores a (n) dias."
+    delete_merged_stub_topics_after_days: "Quantidade de dias para aguardar antes de excluir automaticamente tópicos de stub totalmente mesclados. Defina para 0 para nunca excluir tópicos de stub."
     bootstrap_mode_min_users: "Quantidade mínima de usuários(as) necessários(as) para desativar o modo de inicialização (defina como 0 para desativar)"
+    prevent_anons_from_downloading_files: "Impeça que usuários(as) anônimos(as) baixem anexos."
+    secure_media: 'Limita acesso a TODOS os envios (imagens, vídeo, áudio, texto, pdfs, zips e muito mais). Se “É necessário entrar com a conta” estiver ativado, apenas usuários(as) que entraram com a conta podem acessar os envios. Caso contrário, o acesso será limitado apenas a envios de mídias em mensagens e categorias privadas. AVISO: esta configuração é complexa e requer conhecimento de administração. Consulte <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">o tópico de mídias seguras em Meta</a> para obter detalhes.'
+    secure_media_allow_embed_images_in_emails: "Permite incorporação de imagens seguras que geralmente seriam escritas em e-mails, caso seu tamanho seja menor do que a configuração \"tamanho máx. de imagem incorporada no e-mail, em KB\"."
+    secure_media_max_email_embed_image_size_kb: "A redução de tamanho para imagens seguras que serão incorporadas nos e-mails se a configuração \"Permissão de incorporação de mídias seguras no e-mail\". Caso não esteja ativada, esta configuração não terá efeito."
     slug_generation_method: "Escolha um método para geração de slug. \"Codificado\" irá gerar linhas com \"%\". 'Nenhum\" irá desativar a geração de slugs."
     enable_emoji: "Ativar emoji"
     enable_emoji_shortcuts: "Texto com carinhas comuns como :): p :( será convertido em emojis"
@@ -1686,15 +1999,23 @@ pt_BR:
     code_formatting_style: "O botão de código no compositor será este estilo de formatação de código por padrão"
     max_allowed_message_recipients: "Quantidade máxima de destinatários permitidos em uma mensagem."
     watched_words_regular_expressions: "Palavras acompanhadas são expressões regulares."
+    enable_diffhtml_preview: "Recurso experimental que usa diffHTML para sincronizar pré-visualização em vez de outra renderização total"
     old_post_notice_days: "Dias antes do aviso de postagem se tornar antigo"
     new_user_notice_tl: "Nível de confiança mínimo necessário para ver novos avisos de postagem do(a) usuário(a)."
     returning_user_notice_tl: "Nível de confiança mínimo necessário para ver os avisos de postagem do(a) usuário(a) retornando."
     returning_users_days: "Quantos dias devem passar antes que um(a) usuário(a) seja considerado(a) retornando."
+    review_media_unless_trust_level: "A equipe revisará postagens de usuários com níveis de confiança menores caso contenham mídias incorporadas."
+    blur_tl0_flagged_posts_media: "Desfoque imagens de postagens sinalizadas para ocultar conteúdos possivelmente nocivos."
+    enable_page_publishing: "Permita que membros da equipe publiquem tópicos para novas URLs com seu próprio estilo."
+    show_published_pages_login_required: "Usuários(as) anônimos(as) podem ser páginas publicadas mesmo quando for necessário entrar com a conta."
+    skip_auto_delete_reply_likes: "Ao excluir automaticamente respostas antigas, pular exclusão de postagens com esta quantidade de curtidas ou mais."
     default_email_digest_frequency: "Frequência com que os(as) usuários(as) recebem e-mails de resumo por padrão."
     default_include_tl0_in_digests: "Inclua postagens de novos(as) usuários(as) em e-mails de resumo por padrão. Os(as) usuários(as) podem mudar isso em suas preferências."
+    default_email_level: "Defina nível de notificação de e-mail padrão para tópicos regulares."
     default_email_messages_level: "Defina o nível de notificação por e-mail padrão quando alguém envia uma mensagem ao(à) usuário(a)."
     default_email_mailing_list_mode: "Envie um e-mail a cada nova postagem por padrão."
     default_email_mailing_list_mode_frequency: "Os(as) usuários(as) que ativam o modo lista de endereçamento receberão e-mails com frequência por padrão."
+    disable_mailing_list_mode: "Impedir que usuários(as) ativem o modo lista de endereçamento (evita o envio de e-mails de lista de endereçamento.)"
     default_email_previous_replies: "Inclua respostas anteriores em e-mails por padrão."
     default_email_in_reply_to: "Inclua trecho de resposta de postagem em e-mails por padrão."
     default_other_new_topic_duration_minutes: "Condição padrão global para a qual um tópico é considerado novo."
@@ -1704,16 +2025,24 @@ pt_BR:
     default_other_enable_quoting: "Ative a citação de resposta para texto realçado por padrão."
     default_other_enable_defer: "Ative a funcionalidade de adiar tópico por padrão."
     default_other_dynamic_favicon: "Mostre contagem de tópicos novos/atualizados no ícone do navegador por padrão."
+    default_other_skip_new_user_tips: "Pule emblemas e dicas de integração de novo(a) usuário(a)."
     default_other_like_notification_frequency: "Notificar usuários(as) sobre curtidas por padrão"
     default_topics_automatic_unpin: "Desvincule tópicos automaticamente quando o(a) usuário(a) alcançar a parte inferior por padrão."
     default_categories_watching: "Lista de categorias que são acompanhadas por padrão."
     default_categories_tracking: "Lista de categorias que são monitoradas por padrão."
     default_categories_muted: "Lista de categorias que são silenciadas por padrão."
     default_categories_watching_first_post: "Lista de categorias nas quais a primeira postagem em cada novo tópico será acompanhada por padrão."
+    default_categories_regular: "Lista de categorias que não foram silenciadas por padrão. É útil quando a configuração do site \"mute_all_categories_by_default\" estiver ativada."
+    mute_all_categories_by_default: "Defina o nível de notificação padrão de todas as categorias para silenciado(a). É preciso que os(as) usuários(as) aceitem que suas categorias sejam exibidas nas páginas \"mais recentes\" e \"categorias\". Se quiser modificar os padrões para usuários(as) anônimos(as), defina as configurações \"default_categories_\"."
+    default_tags_watching: "Lista de etiquetas que são acompanhadas por padrão."
+    default_tags_tracking: "Lista de etiquetas que são monitoradas por padrão."
+    default_tags_muted: "Lista de etiquetas que são silenciadas por padrão."
+    default_tags_watching_first_post: "Lista de etiquetas nas quais a primeira postagem em cada novo tópico será acompanhada por padrão."
     default_text_size: "Tamanho do texto que é selecionado por padrão"
     default_title_count_mode: "Modo padrão para o contador de títulos da página"
     retain_web_hook_events_period_days: "Quantidade de dias para manter registros de eventos de webhook."
     retry_web_hook_events: "Repita automaticamente os eventos com falha do webhook quatro vezes. Os intervalos de tempo entre as tentativas são de 1, 5, 25 e 125 minutos."
+    revoke_api_keys_days: "Quantidade de dias antes de uma chave de API não usada ser revogada automaticamente (0 para nunca)"
     allow_user_api_keys: "Permitir geração de chaves de API do(a) usuário(a)"
     allow_user_api_key_scopes: "Lista de escopos permitidos para chaves de API do(a) usuário(a)"
     min_trust_level_for_user_api_key: "Nível de confiança necessário para geração de chaves de API do(a) usuário(a)"
@@ -1740,8 +2069,20 @@ pt_BR:
     shared_drafts_category: "Ative o recurso Rascunhos compartilhados ao designar uma categoria para rascunhos de tópicos. Os tópicos nesta categoria serão bloqueados das listas de tópicos para usuários da equipe."
     shared_drafts_min_trust_level: "Permita que os(as) usuários(as) visualizem e editem os Rascunhos compartilhados."
     push_notifications_prompt: "Exiba o prompt de consentimento do(a) usuário(a)."
+    push_notifications_icon: "O ícone do emblema que é exibido no canto de notificações. É recomendável um PNG monocromático de 96×96."
+    base_font: "Fonte básica para usar nos textos mais importantes do site. É possível substituir os temas pela propriedade personalizada de CSS \"--font-family\"."
+    heading_font: "Fonte para usar nos cabeçalhos do site. É possível substituir os temas pela propriedade personalizada de CSS \"--heading-font-family\"."
     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."
     dashboard_general_tab_activity_metrics: "Escolha relatórios para serem exibidos como métricas de atividade na aba geral."
+    gravatar_name: "Nove do provedor Gravatar"
+    gravatar_base_url: "URL da base de APIs do provedor Gravatar"
+    gravatar_login_url: "URL relacionada a gravatar_base_url, que permite ao(à) usuário(a) entrar com a conta no serviço Gravatar"
+    share_quote_buttons: "Determine quais e em que ordem os itens são exibidos na citação compartilhando widget."
+    share_quote_visibility: "Determine quando exibir botões de compartilhamento de citações: nunca, apenas para usuários(as) anônimos(as) ou todos(as) os(as) usuários(as). "
+    create_revision_on_bulk_topic_moves: "Crie revisão para as primeiras postagens quando os tópicos forem movidos em massa para uma nova categoria."
+    allow_changing_staged_user_tracking: "Permitir a alteração das preferências de notificação de etiquetas e categoria do(a) usuário(a) por parte de um(a) usuário(a) administrador(a)."
     errors:
       invalid_email: "Endereço de e-mail inválido"
       invalid_username: "Não há nenhum(a) usuário(a) com este nome de usuário(a)."
@@ -1756,6 +2097,7 @@ pt_BR:
       invalid_string_min_max: "Precisa estar entre %{min} e %{max} caracteres."
       invalid_string_min: "Precisa ter no mínimo %{min} caracteres."
       invalid_string_max: "Não pode ter mais que %{max} caracteres."
+      invalid_json: "JSON inválido."
       invalid_reply_by_email_address: "O valor deve conter \"%{reply_key}\" e ser diferente do e-mail de notificação."
       invalid_alternative_reply_by_email_addresses: "Todos os valores devem conter \"%{reply_key}\" e ser diferente do e-mail de notificação."
       pop3_polling_host_is_empty: "Você deve definir um \"host de pesquisa POP3\"' antes de ativar a consulta POP3."
@@ -1769,19 +2111,27 @@ pt_BR:
       email_editable_enabled: "Você deve desativar o \"e-mail editável\" antes de ativar esta configuração."
       staged_users_disabled: "Primeiro você deve ativar os \"usuários(as) encenados(as)\" antes de ativar esta configuração."
       reply_by_email_disabled: "Você deve ativar \"responder por e-mail\" antes de ativar esta configuração primeiro."
+      discourse_connect_url_is_empty: "É preciso definir uma \"url de conexão do Discourse\" antes de ativar esta configuração."
+      discourse_connect_invite_only: "Não é possível ativar o DiscourseConnect e \"apenas convite\" ao mesmo tempo."
       enable_local_logins_disabled: "Você deve ativar \"ativar entradas com e-mail em modo local\" antes de ativar esta configuração."
       min_username_length_exists: "Você não pode definir o tamanho mínimo do nome do(a) usuário(a) acima do nome do(a) usuário(a) mais curto (%{username})."
       min_username_length_range: "Você não pode definir o mínimo acima do máximo."
       max_username_length_exists: "Você não pode definir o tamanho máximo do nome do(a) usuário(a) abaixo do nome do(a) usuário(a) mais longo (%{username})."
       max_username_length_range: "Você não pode definir o máximo abaixo do mínimo."
       invalid_hex_value: "Os valores de cor precisam ser códigos hexadecimais de seis dígitos."
+      empty_selectable_avatars: "É preciso enviar pelo menos dois avatares selecionáveis antes de ativar esta configuração."
+      category_search_priority:
+        low_weight_invalid: "Não é possível definir a largura como um valor maior ou igual a 1."
+        high_weight_invalid: "Não é possível definir uma altura menor ou igual a 1."
       allowed_unicode_usernames:
         regex_invalid: "A expressão regular é inválida: %{error}"
         leading_trailing_slash: "A expressão regular não deve começar e terminar com uma barra."
       unicode_usernames_avatars: "Os avatares internos do sistema não são compatíveis com nomes de usuário(as) Unicode."
+      list_value_count: "A lista deve conter exatamente %{count} valores."
     placeholder:
       discourse_connect_provider_secrets:
         key: "www.exemplo.com.br"
+        value: "Segredo do DiscourseConnect"
   search:
     extreme_load_error: "O site está recebendo uma quantidade de acessos enorme, a pesquisa está desativada, tente novamente mais tarde"
     within_post: "#%{post_number} de %{username}"
@@ -1799,11 +2149,14 @@ pt_BR:
     unknown_error: "Há um problema com sua conta. Entre em contato com o(a) administrador(a) do site."
     timeout_expired: "A entrada com a sua conta expirou, entrar novamente."
     no_email: "Nenhum endereço de e-mail foi informado. Entre em contato com o(a) administrador(a) do site."
+    blank_id_error: "O \"external_id\" é obrigatório, mas estava vazio"
     email_error: "Não foi possível registrar uma conta com o endereço de e-mail <b>%{email}</b>. Entre em contato com o(a) administrador(a) do site."
+    missing_secret: "Falha na autenticação devido ao segredo ausente. Entre em contato com os(as) administradores(as) do site para solucionar este problema."
+    invite_redeem_failed: "Falha ao resgatar convite. Entre em contato com o(a) administrador(a) do site."
   original_poster: "Autor(a) original"
-  most_posts: "Maior parte das postagens"
   most_recent_poster: "Autor(a) mais recente"
   frequent_poster: "Autor(a) frequente"
+  poster_description_joiner: ", "
   redirected_to_top_reasons:
     new_user: "Boas-vindas à nossa comunidade! Confira os nossos tópicos mais acessados recentemente."
     not_seen_in_a_month: "Boas-vindas outra vez! Faz tempo desde o seu último acesso. Confira os principais tópicos mais acessados desde a sua última visita."
@@ -1814,6 +2167,7 @@ pt_BR:
     errors:
       different_topics: "Postagens que pertencem a tópicos diferentes não podem ser mescladas."
       different_users: "Postagens que pertencem a usuários(as) diferentes não podem ser mescladas."
+      max_post_length: "Não é possível mesclar postagens porque o tamanho das postagens mescladas é maior do que o permitido."
   move_posts:
     new_topic_moderator_post:
       one: "Uma postagem foi dividida em um novo tópico: %{topic_link}"
@@ -1832,6 +2186,7 @@ pt_BR:
   publish_page:
     slug_errors:
       blank: "não pode estar em branco"
+      unavailable: "não está disponível"
       invalid: "contém caracteres inválidos"
   topic_statuses:
     autoclosed_message_max_posts:
@@ -1880,12 +2235,15 @@ pt_BR:
     autoclosed_disabled_lastpost: "Este tópico está aberto agora. Novas respostas são permitidas."
     auto_deleted_by_timer: "Excluído automaticamente pelo temporizador."
   login:
+    invalid_second_factor_method: "O método de autenticação de dois fatores selecionado é inválido."
+    not_enabled_second_factor_method: "O método de autenticação de dois fatores selecionado não foi ativado para sua conta."
     security_key_description: "Quando você tiver sua chave física de segurança preparada, pressione o botão Autenticar com chave de segurança abaixo."
     security_key_alternative: "Tentar de outra forma"
     security_key_authenticate: "Autenticar com chave de segurança"
     security_key_not_allowed_error: "O processo de autenticação de chave de segurança atingiu o limite de tempo ou foi cancelado."
     security_key_no_matching_credential_error: "Nenhuma credencial correspondente pôde ser encontrada na chave de segurança fornecida."
     security_key_support_missing_error: "Seu dispositivo ou navegador atual não é compatível com o uso de chaves de segurança. Use um método diferente."
+    security_key_invalid: "Ocorreu um erro ao validar a chave de segurança."
     not_approved: "Sua conta ainda não foi aprovada. Você será notificado(a) por e-mail quando tudo estiver pronto para entrar."
     incorrect_username_email_or_password: "Usuário(a), e-mail ou senha incorreta"
     incorrect_password: "senha incorreta"
@@ -1895,6 +2253,7 @@ pt_BR:
     not_activated: "Ainda não é possível entrar com a conta. Enviamos um e-mail de ativação. Siga as instruções no e*mail para ativar a sua conta."
     not_allowed_from_ip_address: "Você não pode entrar como %{username} a partir deste endereço IP."
     admin_not_allowed_from_ip_address: "Você não pode entrar como administrador(a) a partir deste endereço IP."
+    reset_not_allowed_from_ip_address: "Não é possível solicitar uma redefinição de senha a partir deste endereço IP."
     suspended: "Você não pode entrar até %{date}."
     suspended_with_reason: "Conta suspensa até %{date}: %{reason}"
     errors: "%{errors}"
@@ -1904,6 +2263,7 @@ pt_BR:
       generic: "Desculpe, houve um erro ao autorizar sua conta. Tente novamente."
       csrf_detected: "A autorização demorou muito ou você mudou de navegador. Tente novamente."
       request_error: "Ocorreu um erro ao iniciar a autorização. Tente novamente."
+      invalid_iat: "Não foi possível verificar o token de autorização devido a diferenças no relógio do servidor. Tente novamente."
     omniauth_error_unknown: "Algo deu errado ao processar seu login, por favor tente novamente."
     omniauth_confirm_title: "Entrar com a conta usando %{provider}"
     omniauth_confirm_button: "Continuar"
@@ -1911,24 +2271,47 @@ pt_BR:
     new_registrations_disabled: "Não é permitido cadastrar novas contas por enquanto."
     password_too_long: "Senhas são limitadas a 200 caracteres."
     email_too_long: "O e-mail informado é muito longo. Os endereços de e-mail não devem ter mais de 254 caracteres, e nomes de domínio devem ter no máximo 253 caracteres."
+    wrong_invite_code: "O código de convite inserido estava incorreto."
     reserved_username: "Este nome de usuário(a) não é permitido."
     missing_user_field: "Você não completou todos campos de usuário(a)"
     auth_complete: "A autenticação está completa."
     click_to_continue: "Clique aqui para continuar."
+    already_logged_in: "Desculpe! Este convite foi elaborado para usuários(as) novos(as), que ainda nao têm uma conta ativa."
+    second_factor_title: "Autenticação de dois fatores"
     second_factor_description: "Insira o código de autenticação necessário no seu aplicativo:"
     second_factor_backup_description: "Insira um dos seus códigos de backup:"
+    second_factor_backup_title: "Código de backup de dois fatores"
     invalid_second_factor_code: "Código de autenticação inválido. Cada código só pode ser usado uma vez."
+    invalid_security_key: "Chave de segurança inválida."
+    missing_second_factor_name: "Informe um nome."
+    missing_second_factor_code: "Informe um código."
     second_factor_toggle:
       totp: "Usar um aplicativo autenticador ou chave de segurança"
       backup_code: "Usar um código de backup"
   admin:
     email:
       sent_test: "enviou!"
+    user:
+      merge_user:
+        updating_username: "Atualizando nome do(a) usuário(a)..."
+        changing_post_ownership: "Alterando propriedade da postagem..."
+        merging_given_daily_likes: "Mesclando curtidas diárias..."
+        merging_post_timings: "Mesclando tempos de postagem..."
+        merging_user_visits: "Mesclando acessos de usuário(a)..."
+        updating_site_settings: "Atualizando configurações do site..."
+        updating_user_stats: "Atualizando estatísticas do(a) usuário(a)..."
+        merging_user_attributes: "Mesclando atributos do(a) usuário(a)..."
+        updating_user_ids: "Atualizando ids de usuário(a)..."
+        deleting_source_user: "Excluindo usuário de origem..."
   user:
     deactivated: "Desativado(a) por causa de muitos e-mails devolvidos para \"%{email}\"."
     deactivated_by_staff: "Desativado pela equipe"
+    deactivated_by_inactivity:
+      one: "Desativado automaticamente após %{count} dia de inatividade"
+      other: "Desativado automaticamente após %{count} dias de inatividade"
     activated_by_staff: "Ativado pela equipe"
     new_user_typed_too_fast: "O(a) novo(a) usuário(a) digitou muito rápido"
+    content_matches_auto_silence_regex: "O conteúdo corresponde ao regex silenciado automaticamente"
     content_matches_auto_block_regex: "O conteúdo corresponde ao regex de bloco automático"
     username:
       short: "deve ter no mínimo %{min} caracteres"
@@ -1942,9 +2325,11 @@ pt_BR:
       must_not_contain_two_special_chars_in_seq: "não deve conter uma sequência de dois ou mais caracteres especiais (.-_)"
       must_not_end_with_confusing_suffix: "não deve terminar com um sufixo confuso como .json ou .png etc."
     email:
+      invalid: "é inválido(a)."
       not_allowed: "este provedor de e-mail não é permitido. Utilize outro endereço de e-mail."
       blocked: "não é permitido."
       revoked: "Não enviará e-mails para \"%{email}\" até %{date}."
+      does_not_exist: "N/D"
     ip_address:
       blocked: "Novos registros não são permitidos a partir do seu endereço de IP."
       max_new_accounts_per_registration_ip: "Novos registros não são permitidos a partir do seu endereço de IP (quantidade máxima alcançada). Entre em contato com um membro da equipe."
@@ -1959,6 +2344,11 @@ pt_BR:
       reviewable_reject_auto: "Tratamento automático de revisáveis na fila"
       reviewable_reject: "Usuário(a) revisável rejeitado(a)"
     email_in_spam_header: "O primeiro e-mail do usuário foi sinalizado como spam"
+    already_silenced: "O(a) usuário(a) já foi silenciado(a) por %{staff}%{time_ago}."
+    already_suspended: "O(a) usuário(a) já foi suspenso(a) por %{staff}%{time_ago}."
+    cannot_delete_has_posts:
+      one: "O(a) usuário(a) %{username} tem %{count} postagem em um tópico público ou mensagem pessoal, de forma que não pode ser excluído(a)."
+      other: "O(a) usuário(a) %{username} tem %{count} postagens em um tópico público ou mensagem pessoal, de forma que não pode ser excluído(a)."
   reviewables_reminder:
     submitted:
       one: "Os itens foram enviados durante %{count} hora atrás. [Revise-os] (%{base_path}/review)."
@@ -2075,6 +2465,47 @@ pt_BR:
   test_mailer:
     title: "Testar mensageiro"
     subject_template: "[%{email_prefix}] Teste de entrega de e-mail"
+    text_body_template: |
+      Este é um e-mail de teste de
+
+      [**%{base_url}**][0]
+
+      Estamos com dificuldades para entregar o e-mail. Confira algumas coisas importantes que precisam ser verificadas:
+
+      - Defina o "e-mail de notificação" corretamente nas configurações do site. **O domínio especificado no endereço "de" dos e-mails enviados é o domínio com o qual o seu e-mail será validado**.
+
+      - Visualize a origem não processada no seu cliente de e-mail, de forma que você possa conferir os cabeçalhos de e-mail para obter pistas importantes. No Gmail, é a opção "mostrar original" no menu suspenso, no canto superior à direita de cada e-mail.
+
+      - **IMPORTANTE:** Seu ISP tem um registro de DNS reverso inserido para associar os nomes de domínio e endereços IP a partir dos quais você envia e-mail? [Teste seu registro PTR reverso][2] aqui. Se o seu ISP não inserir o registro de ponteiro DNS reverso apropriado, existe pouquíssima probabilidade de que seu e-mail seja entregue.
+
+      - Se o [registro SPF] do seu domínio[8] está correto. [Teste seu registro SPF][1] aqui. Observe que o TXT é o tipo de registro oficial correto para o SPF.
+
+      - Se o [registro DKIM] do seu domínio[3] está correto. Isso irá aumentará muito a chance de o seu e-mail ser entregue. [Teste seu registro DKIM][7] aqui.
+
+      - Se você rodar seu próprio servidor de e-mail, verifique se os IPs do seu servidor de e-mail não [estão em nenhuma lista de bloqueio de e-mails][4]. Além disso, verifique se está sendo enviado um nome de host plenamente qualificado que é resolvido no DNS da sua mensagem HELO. Caso contrário, isso fará que o seu e-mail seja rejeitado por vários serviços.
+
+      - É altamente recomendável **enviar um e-mail de teste para [mail-tester.com][mt]** para verificar se tudo o que foi mencionado acima está funcionando corretamente.
+
+      (Esta é a maneira *fácil* de criar uma conta em [SendGrid][sg], [SparkPost][sp], [Mailgun][mg] ou [Mailjet][mj], que tem planos de e-mail de baixo custo para comunidades pequenas. Mas ainda será preciso definir os registros DKIM e SPF no seu DNS!)
+
+      Esperamos que você tenha recebido este teste de entrega de e-mail!
+
+      Boa sorte,
+
+      Seus amigos do [Discourse](https://www.discourse.org)
+
+      [0]: %{base_url}
+      [1]: https://www.kitterman.com/spf/validate.html
+      [2]: https://mxtoolbox.com/ReverseLookup.aspx
+      [3]: http://www.dkim.org/
+      [4]: https://whatismyipaddress.com/blacklist-check
+      [7]: https://www.mail-tester.com/spf-dkim-check
+      [8]: http://www.openspf.org/SPF_Record_Syntax
+      [sg]: https://goo.gl/r1WMF6
+      [sp]: https://www.sparkpost.com/
+      [mg]: https://www.mailgun.com/
+      [mj]: https://www.mailjet.com/pricing/
+      [mt]: https://www.mail-tester.com/
   new_version_mailer:
     title: "Nova versão do mensageiro"
     subject_template: "[%{email_prefix}] Nova versão do Discourse, atualização disponível"
@@ -2128,6 +2559,17 @@ pt_BR:
         Para obter mais orientações, consulte nossas [diretrizes da comunidade](%{base_url}/guidelines).
     queued_by_staff:
       title: "A postagem requer aprovação"
+      subject_template: "Postagem oculta pela equipe, aguardando aprovaçao"
+      text_body_template: |
+        Olá,
+
+        Esta é uma mensagem automática de %{site_name} para avisar que sua postagem foi oculta.
+
+        <%{base_url}%{url}>
+
+        Sua postagem permanecerá oculta até a revisão de um membro da equipe.
+
+        Para mais informações, consulte as nossas [diretrizes da comunidade](%{base_url}/guidelines).
     flags_disagreed:
       title: "Postagem sinalizada restaurada pela equipe"
       subject_template: "Postagem sinalizada restaurada pela equipe"
@@ -2146,6 +2588,21 @@ pt_BR:
     flags_agreed_and_post_deleted:
       title: "Postagem sinalizada removida pela equipe"
       subject_template: "Postagem sinalizada removida pela equipe"
+      text_body_template: |
+        Olá,
+
+        Esta é uma mensagem automática de %{site_name} para informar que a [sua postagem](%{base_url}%{url}) foi removida.
+
+        %{flag_reason}
+
+        Esta postagem foi sinalizada pela comunidade e um membro da equipe optou por removê-la.
+
+
+        ``` markdown
+        %{flagged_post_raw_content}
+        ```
+
+        Leia novamente as nossas [diretrizes da comunidade](%{base_url}/guidelines) para obter informações.
     usage_tips:
       text_body_template: |
         Para obter algumas dicas rápidas sobre como começar como um(a) novo(a) usuário(a), [confira esta postagem no blog](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
@@ -2170,7 +2627,14 @@ pt_BR:
 
         Estamos muito felizes com a sua visita e adoraríamos saber mais sobre você. Tire um momento para [preencher seu perfil](%{base_url}/my/preferences/profile) ou sinta-se à vontade para [iniciar um novo tópico](%{base_url}/categories).
     welcome_staff:
+      title: "Equipe de boas-vindas"
       subject_template: "Parabéns, você recebeu o status %{role}!"
+      text_body_template: |
+        Você recebeu o status %{role} por um membro da equipe.
+
+        Na função de %{role}, você já tem acesso à <a href='%{base_url}/admin' target='_blank'>interface do(a) usuário(a)</a>.
+
+        Grandes poderes trazem grandes responsabilidades. Se você estiver agindo como moderador pela primeira vez, consulte o [Guia de Moderação](https://meta.discourse.org/t/discourse-moderation-guide/63116).
     welcome_invite:
       title: "Convite de boas-vindas"
       subject_template: "Boas-vindas ao %{site_name}!"
@@ -2190,6 +2654,12 @@ pt_BR:
         [prefs]: %{user_preferences_url}
     tl2_promotion_message:
       subject_template: "Parabéns pela sua promoção de nível de confiança!"
+      text_body_template: |
+        Elaboramos outro [nível de confiança](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)!
+
+        Sendo um(a) usuário(a) experiente, você pode gostar [desta lista de truques e dicas úteis](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
+
+        Incentivamos ainda mais a sua participação, gostamos de você.
     backup_succeeded:
       title: "Backup realizado com êxito"
       subject_template: "Backup concluído com êxito"
@@ -2253,6 +2723,9 @@ pt_BR:
         ```
     user_added_to_group_as_owner:
       title: "Adicionado ao grupo como proprietário(a)"
+      subject_template: "Você foi adicionado(a) como um(a) dos(as) proprietários(as) do grupo %{group_name}"
+      text_body_template: |
+        Você foi adicionado(a) como um(a) dos(as) proprietários(as) do grupo [%{group_name}](%{base_url}%{group_path}).
     user_added_to_group_as_member:
       title: "Adicionado ao grupo como membro"
       subject_template: "Você foi adicionado(a) como membro do grupo %{group_name}"
@@ -2261,6 +2734,14 @@ pt_BR:
     csv_export_succeeded:
       title: "A exportação CSV foi bem-sucedida"
       subject_template: "[%{export_title}] exportação de dados concluída"
+      text_body_template: |
+        Seus dados foram exportados! :dvd:
+
+        %{download_link}
+
+        O link de download acima permanecerá válido por 48 horas.
+
+        Os dados foram compactados em um arquivo .zip. Caso não seja extraído ao abrir, use a ferramenta recomendada aqui: https://www.7-zip.org/
     csv_export_failed:
       title: "Falha na exportação de CSV"
       subject_template: "A exportação de dados falhou"
@@ -2325,119 +2806,140 @@ pt_BR:
         Se você está recebendo isso e você incluiu uma resposta, tente novamente com uma formatação mais simples.
     email_reject_parsing:
       title: "E-mail rejeitado em análise"
-      subject_template: "[%{email_prefix}] Problema por e-mail - conteúdo não reconhecido"
+      subject_template: "[%{email_prefix}] Problema no e-mai, conteúdo não reconhecido"
       text_body_template: |
-        Nos desculpamos, mas sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou.
+        Desculpe, mas sua mensagem de e-mail para %{destination} (com o título de %{former_title}) não funcionou.
 
-        Não pudemos encontrar seu resposta no email. **Certifique-se que sua resposta está no topo do email** -- não conseguimos processar respostas em linha.
+        Não pudemos encontrar seu resposta no e-mail. **Verifique se sua resposta está no topo do e-mail**, não foi possível processar respostas em linha.
     email_reject_invalid_access:
-      title: "E-mail Rejeitado, acesso inválido"
-      subject_template: "[%{email_prefix}] Problema de e-mail - Acesso inválido"
+      title: "E-mail rejeitado, acesso inválido"
+      subject_template: "[%{email_prefix}] Problema no e-mail, acesso inválido"
       text_body_template: |
-        Desculpe, mas sua mensagem de e-mail para %{destination} (intulada %{former_title}) não furcionou.
+        Desculpe, mas sua mensagem de e-mail para %{destination} (com o título de %{former_title}) não funcionou.
 
-        Sua conta não tem os privilégios para postar novos tópicos nessa categoria. Se você acredita que isso é um erro, [contate um membro da equipe](%{base_url}/sobre isso).
+        Sua conta não tem os privilégios para postar novos tópicos nesta categoria. Se você acha que isso é um erro, [entre em contato com um membro da equipe](%{base_url}/about).
     email_reject_strangers_not_allowed:
-      title: "E-mail Rejeitado, Estranhos Não Permitidos"
-      subject_template: "[%{email_prefix}] Problema de e-mail - Acesso inválido"
+      title: "E-mail rejeitado, estranhos(as) não permitidos(as)"
+      subject_template: "[%{email_prefix}] Problema no e-mail, acesso inválido"
       text_body_template: |
-        Desculpe, mas sua mensagem de e-mail para %{destination} (intitulada %{former_title}) não funcionou.
+        Desculpe, mas sua mensagem de e-mail para %{destination} (com o título de  %{former_title}) não funcionou.
 
-        A categoria para a qual você enviou este e-mail permite somente respostas de usuários com contas válidas e endereços de e-mail conhecidos. Se você acredita que isso é um erro, [entre em contato com um funcionário](%{base_url}/sobre isso).
+        A categoria para a qual você enviou este e-mail permite somente respostas de usuários(as) com contas válidas e endereços de e-mail conhecidos. Se você acha que isso é um erro, [entre em contato com um membro da equipe](%{base_url}/about).
     email_reject_invalid_post:
-      title: "E-mail Rejeitado, Post inválido"
-      subject_template: "[%{email_prefix}] Problema de e-mail - erro de postagem"
+      title: "E-mail rejeitado, postagem inválida"
+      subject_template: "[%{email_prefix}] Problema no e-mail, erro na postagem"
       text_body_template: |
-        Desculpe, mas sua mensagem de e-mail para %{destination} (intitulada %{former_title}) não funcionou.
+        Desculpe, mas sua mensagem de e-mail para %{destination} (com o título de %{former_title}) não funcionou.
 
-        Algumas causas possíveis são: formatação complexa, mensagem muito grande, mensagem muito pequena. Por favor, tente novamente, ou poste através do site, se isso continuar.
+        Algumas causas possíveis são: formatação complexa, mensagem muito grande, mensagem muito pequena. Tente novamente, ou poste pelo site se isso continuar.
     email_reject_invalid_post_specified:
-      title: "E-mail Rejeitado, especificado inválido do post"
-      subject_template: "[%{email_prefix}] Problema de e-mail - erro de postagem"
+      title: "E-mail rejeitado, postagem inválida especificada"
+      subject_template: "[%{email_prefix}] Problema no e-mail, erro na postagem"
       text_body_template: |
-        Desculpe, mas sua mensagem de e-mail para%{destination} (intitulada %{former_title}) não funcionou.
+        Desculpe, mas sua mensagem de e-mail para%{destination} (com o título de %{former_title}) não funcionou.
 
-        Razão:
+        Motivo:
 
         %{post_error}
 
-        Se você puder corrigir o problema, tente novamente
-      date_invalid: "Nenhuma data de criação de postagem foi encontrada. O e-mail está faltando um cabeçalho Date:?"
+        Se você puder corrigir o problema, tente novamente.
+      date_invalid: "Nenhuma data de criação para postagem foi encontrada. Falta data no e-mail: cabeçalho?"
     email_reject_post_too_short:
-      title: "Rejeição de E-mail de Postagem Muito Curta"
-      subject_template: "[%{email_prefix}] Problema de e-mail -- postagem muito curta"
+      title: "Rejeição de e-mail, postagem muito curta"
+      subject_template: "[%{email_prefix}] Problema no e-mail, postagem muito curta"
       text_body_template: |
-        Pedimos desculpa, mas a sua mensagem de e-mail para %{destination} (intitulado %{former_title}) não funcionou.
+        Desculpe, mas a sua mensagem de e-mail para %{destination} (com o título de %{former_title}) não funcionou.
 
-        Para promover conversas mais profundas, respostas muito curtas não são permitidas. Você pode por favor responder com pelo menos %{count} caracteres? Como alternativa, você pode curtir uma postagem por e-mail respondendo com "+1".
+        Para promover conversas mais complexas, respostas muito curtas não são permitidas. Você pode responder com pelo menos %{count} caracteres? Como alternativa, também é possível curtir uma postagem por e-mail respondendo com "+1".
     email_reject_invalid_post_action:
-      title: "E-mail Rejeitado por Publicação de Ação Inválida"
-      subject_template: "[%{email_prefix}] Problema por e-mail - ação de postagem inválida"
+      title: "E-mail rejeitado por publicação de ação inválida"
+      subject_template: "[%{email_prefix}] Problema no e-mail, ação de postagem inválida"
       text_body_template: |
-        Desculpe, mas sua mensagem de e-mail para %{destination} (intitulada%{former_title}) não funcionou.
-        A ação de postagem não foi reconhecida. Por favor, tente novamente, ou poste através do site, se isso continuar.
+        Desculpe, mas sua mensagem de e-mail para %{destination} (com o título de %{former_title}) não funcionou.
+        A ação de postagem não foi reconhecida. Tente novamente, ou poste pelo site se isso continuar.
     email_reject_reply_key:
-      title: "E-mail Rejeitado por Chave de Resposta"
-      subject_template: "[%{email_prefix}] Problema de e-mail - chave de resposta desconhecida"
+      title: "E-mail rejeitado por chave de resposta"
+      subject_template: "[%{email_prefix}] Problema no e-mail, chave de resposta desconhecida"
       text_body_template: |
-        Desculpe, mas sua mensagem de e-mail para %{destination} (intitulada %{former_title}) não funcionou.
+        Desculpe, mas sua mensagem de e-mail para %{destination} (com o título de %{former_title}) não funcionou.
 
-        A chave de resposta no e-mail é inválida ou desconhecida, por isso não podemos descobrir em que este e-mail está em resposta. [Entre em contato com um membro da equipe](%{base_url}/sobre).
+        A chave de resposta no e-mail é inválida ou desconhecida, por isso não podemos descobrir ao que este e-mail está respondendo. [Entre em contato com um membro da equipe](%{base_url}/about).
     email_reject_bad_destination_address:
-      title: "E-mail Rejeitado por endereço de destino inválido"
-      subject_template: "[%{email_prefix}] Problema de e-mail - desconhecido para: endereço"
+      title: "E-mail rejeitado por endereço de destino inválido"
+      subject_template: "[%{email_prefix}] Problema no e-mail, desconhecido para: endereço"
+      text_body_template: |
+        Desculpe, mas a sua mensagem de e-mail para %{destination} (com o título de %{former_title}) não funcionou.
+
+        Verifique os itens a seguir:
+
+          - Você usa mais de um endereço de e-mail? Respondeu de um endereço de e-mail diferente? É preciso usar o mesmo endereço de e-mail ao responder.
+
+          - Seu software utilizou o endereço de "Responder para:" ao responder? Infelizmente alguns softwares de e-mail enviam respostas para o endereço em "De:", o que não funciona.
+
+          - O cabeçalho da ID da mensagem foi alterada no e-mail? A ID da mensagem não pode ser alterada e deve ser consistente.
+
+        Precisa de mais ajuda? Fale conosco acessando as informações de contato em %{base_url}/about
     email_reject_old_destination:
-      title: "E-mail Rejeitado por Destino Antigo"
-      subject_template: "[%{email_prefix}] Problema de e-mail: você está tentando responder a uma notificação antiga"
+      title: "E-mail rejeitado por destino antigo"
+      subject_template: "[%{email_prefix}] Problema no e-mail, você está tentando responder a uma notificação antiga"
       text_body_template: |
-        Pedimos desculpa, mas a sua mensagem de e-mail para %{destination} (intitulado %{former_title}) não funcionou.
+        Desculpe, mas a sua mensagem de e-mail para %{destination} (com o título de %{former_title}) não funcionou.
 
-        Nós só aceitamos respostas às notificações originais por %{number_of_days} dias. Por favor, [visite o tópico](%{short_url}) para continuar a conversa.
+        Só aceitamos respostas às notificações originais por %{number_of_days} dias. [Acesse o tópico](%{short_url}) para continuar a conversa.
     email_reject_topic_not_found:
-      title: "E-mail Rejeitado por Tópico Não Encontrado"
-      subject_template: "[%{email_prefix}] Problema de e-mail - Tópico não encontrado"
+      title: "E-mail rejeitado por tópico não encontrado"
+      subject_template: "[%{email_prefix}] Problema no e-mail, tópico não encontrado"
       text_body_template: |
-        Desculpe, mas sua mensagem de e-mail para %{destination} (intitulada %{former_title}) não funcionou.
+        Desculpe, mas sua mensagem de e-mail para %{destination} (com o título de %{former_title}) não funcionou.
 
-        O tópico para o qual você está respondendo não existe mais - talvez tenha sido excluído? Se você acredita que isso é um erro, [contate um membro da equipe](%{base_url}/sobre).
+        O tópico para o qual você está respondendo não existe mais, pode ter sido excluído. Se você acha que isso é um erro, [entre em contato com um membro da equipe](%{base_url}/about).
     email_reject_topic_closed:
-      title: "E-mail Rejeitado por Tópico fechado"
-      subject_template: "[%{email_prefix}] Problema de e-mail - Tópico fechado"
+      title: "E-mail rejeitado por tópico fechado"
+      subject_template: "[%{email_prefix}] Problema no e-mail, tópico fechado"
       text_body_template: |
-        Desculpe, mas sua mensagem de e-mail para%{destination} (intitulada %{former_title}) não funcionou.
+        Desculpe, mas sua mensagem de e-mail para%{destination} (com o título de %{former_title}) não funcionou.
 
-        O tópico para o qual você está respondendo está atualmente fechado e não aceita mais respostas. Se você acredita que isso é um erro, [contate um membro da equipe](%{base_url}/sobre).
+        O tópico ao o qual você está respondendo está fechado por enquanto e não aceita mais respostas. Se você acha que isso é um erro, [entre em contato com um membro da equipe](%{base_url}/about).
     email_reject_auto_generated:
-      title: "E-mail Rejeitado Gerado automaticamente"
-      subject_template: "[%{email_prefix}] Problema de e-mail - Resposta gerada automaticamente"
+      title: "E-mail rejeitado, gerado automaticamente"
+      subject_template: "[%{email_prefix}] Problema no e-mail, resposta gerada automaticamente"
       text_body_template: |
-        Desculpe, mas sua mensagem de e-mail para %{destination} (intitulado %{former_title}) não funcionou.
+        Desculpe, mas sua mensagem de e-mail para %{destination} (com o título de %{former_title}) não funcionou.
 
-        Seu e-mail foi marcado como "gerado automaticamente", o que significa que foi criado automaticamente por um computador em vez de ser digitado por um ser humano; não podemos aceitar esses tipos de e-mails. Se você acredita que isso é um erro, [entre em contato com um funcionário](%{base_url}/sobre).
+        Seu e-mail foi marcado como "gerado automaticamente", o que significa que foi criado automaticamente por um computador em vez de ser digitado por um ser humano. Não podemos aceitar esses tipos de e-mails. Se você acha que isso é um erro, [entre em contato com um membro da equipe](%{base_url}/about).
     email_reject_unrecognized_error:
-      title: "E-mail Rejeitado Erro não reconhecido"
-      subject_template: "[%{email_prefix}] Problema de e-mail - erro não reconhecido"
+      title: "E-mail rejeitado, erro não reconhecido"
+      subject_template: "[%{email_prefix}] Problema no e-mail, erro não reconhecido"
       text_body_template: |
-        Desculpe, mas sua mensagem de e-mail para %{destination} (intitulado %{former_title}) não funcionou.
+        Desculpe, mas sua mensagem de e-mail para %{destination} (com o título de %{former_title}) não funcionou.
 
-        Ocorreu um erro não reconhecido ao processar seu e-mail e não foi publicado. Você deve tentar novamente ou [contatar um membro da equipe](%{base_url}/sobre).
+        Ocorreu um erro não reconhecido ao processar seu e-mail e ele não foi publicado. Você deve tentar novamente ou [entrar em contato com um membro da equipe](%{base_url}/about).
     email_reject_attachment:
-      title: "Anexo do E-mail Rejeitado"
-      subject_template: "[%{email_prefix}] Problema de e-mail -- Anexo Rejeitado"
+      title: "Anexo do e-mail rejeitado"
+      subject_template: "[%{email_prefix}] Problema no e-mail, anexo rejeitado"
       text_body_template: |
-        Infelizmente alguns anexos em sua mensagem de e-mail para %{destination} (intitulado %{former_title}) foram rejeitados.
+        Infelizmente alguns anexos em sua mensagem de e-mail para %{destination} (com o título de %{former_title}) foram rejeitados.
 
         Detalhes:
         %{rejected_errors}
 
-        Se você acredita que isto é um erro, [contate um membro da staff](%{base_url}/about).
+        Se você acha que isto é um erro, [entre em contato um membro da equipe](%{base_url}/about).
     email_reject_reply_not_allowed:
-      title: "Rejeição de E-mail de Resposta Não Permitida"
-      subject_template: "[%{email_prefix}] Problema de e-mail -- Resposta Não Permitida"
+      title: "Rejeição de e-mail, resposta não permitida"
+      subject_template: "[%{email_prefix}] Problema no e-mail, resposta não permitida"
       text_body_template: |
         Desculpe, mas sua mensagem de e-mail para %{destination} (com o título de %{former_title}) não funcionou.
 
         Você não tem permissão para responder ao tópico. Se acha que é um erro, [entre em contato com um membro da equipe](%{base_url}/about).
+    email_reject_reply_to_digest:
+      title: "Rejeição de e-mail, resposta para resumo"
+      subject_template: "[%{email_prefix}] Problema no e-mail, resposta para resumo"
+      text_body_template: |
+        Desculpe, mas sua mensagem de e-mail para %{destination} (com o título de %{former_title}) não funcionou.
+
+        Você respondeu ao e-mail de resumo, o que não é permitido.
+
+        Se acha que é um erro, [entre em contato com um membro da equipe](%{base_url}/about).
     email_error_notification:
       title: "Notificação de erro por e-mail"
       subject_template: "[%{email_prefix}] Problema no e-mail, erro de autenticação do POP"
@@ -2518,6 +3020,14 @@ pt_BR:
     spam_post_blocked:
       title: "Postagem de spam bloqueada"
       subject_template: "Postagens de novo(a) usuário(a )%{username} bloqueadas devido a links repetidos"
+      text_body_template: |
+        Está é uma mensagem automática.
+
+        O(a) novo(a) usuário(a) [%{username}](%{user_url}) tentou criar várias postagens com links para %{domains}, mas elas foram bloqueadas para evitar spam. O(a) usuário(a) ainda pode criar novas postagens sem links para %{domains}.
+
+        [Verifique o(a) usuário(a)](%{user_url}).
+
+        Isto pode ser modificado nas configurações do site "newuser_spam_host_threshold" e "white_listed_spam_host_domains". Considere adicionar %{domains} à lista de permissões caso precisem ser isentos.
     unsilenced:
       title: "Som ativado"
       subject_template: "A conta não está mais em espera"
@@ -2593,6 +3103,7 @@ pt_BR:
     only_reply_by_email_pm: "Responda a este e-mail para responder a %{participants}."
     visit_link_to_respond: "[Acesse o tópico](%{base_url}%{url}) para responder."
     visit_link_to_respond_pm: "[Acesser a mensagem](%{base_url}%{url}) para responder a %{participants}."
+    reply_above_line: "## Responda acima desta linha. ##"
     posted_by: "Postado por %{username} em %{post_date}"
     pm_participants: "Participantes: %{participants}"
     invited_group_to_private_message_body: |
@@ -2790,11 +3301,19 @@ pt_BR:
 
         %{message}
     account_suspended:
-      title: "Conta Suspença"
+      title: "Conta suspença"
       subject_template: "[%{email_prefix}] A sua conta foi suspensa"
+      text_body_template: |
+        Você foi suspenso(a) do fórum até %{suspended_till}.
+
+        Motivo: %{reason}
     account_silenced:
-      title: "Conta Silenciada"
+      title: "Conta silenciada"
       subject_template: "[%{email_prefix}] Sua conta foi silenciada"
+      text_body_template: |
+        Você foi silenciado(a) do fórum até %{silenced_till}.
+
+        Motivo: %{reason}
     account_exists:
       title: "esta conta já existe"
       subject_template: "[%{email_prefix}] esta conta já existe"
@@ -2805,12 +3324,22 @@ pt_BR:
 
         Se você não tiver tentado criar uma conta para %{email} ou alterar seu endereço de e-mail, não se preocupe. Você pode ignorar essa mensagem com segurança.
 
+        Se você tiver alguma dúvida, [entre em contato com nossa equipe prestativa](%{base_url}/sobre).
+    account_second_factor_disabled:
+      title: "Autenticação de dois fatores desativada"
+      subject_template: "[%{email_prefix}] Autenticação de dois fatores desativada"
+      text_body_template: |
+        A autenticação de dois fatores foi desativada na sua conta em %{site_name}. Agora você pode entrar com a conta somente usando a senha. Não é mais necessário um código de autenticação adicional.
+
+        Se você não tiver optado por desativar a autenticação de dois fatores, alguém pode ter comprometido sua conta.
+
         Se você tiver alguma dúvida, [entre em contato com nossa equipe prestativa](%{base_url}/sobre).
     digest:
       why: "Um breve resumo de %{site_link} desde a sua última visita em %{last_seen_at}."
       since_last_visit: "Desde a sua última visita"
       new_topics: "Novos tópicos"
       unread_notifications: "Notificações não lidas"
+      unread_high_priority: "Notificações de alta prioridade não lidas"
       liked_received: "Curtidas recebidas"
       new_users: "Usuários(as) novos(as)"
       popular_topics: "Tópicos mais acessados"
@@ -2822,6 +3351,7 @@ pt_BR:
       unsubscribe: "Este resumo foi enviado de %{site_link}, já que faz tempo que não nos vemos. Mude %{email_preferences_link} ou%{unsubscribe_link} para cancelar a inscrição."
       your_email_settings: "suas configurações de e-mail"
       click_here: "clique aqui"
+      from: "%{site_name}"
       preheader: "Um breve resumo do que aconteceu no fórum desde a sua última visita em %{last_seen_at}"
     forgot_password:
       title: "Esqueci a senha"
@@ -2850,6 +3380,13 @@ pt_BR:
     admin_login:
       title: "Entrar com conta de administrador(a)"
       subject_template: "[%{email_prefix}] Entrar com conta"
+      text_body_template: |
+        Alguém pediu para entrar com a sua conta em [%{site_name}](%{base_url}).
+
+        Caso não tenha feito este pedido, ignore este e-mail.
+
+        Clique no link a seguir para entrar com a conta:
+        %{base_url}/session/email-login/%{email_token}
     account_created:
       title: "Conta criada"
       subject_template: "[%{email_prefix}] Sua nova conta"
@@ -2861,15 +3398,31 @@ pt_BR:
     confirm_new_email:
       title: "Confirmar novo e-mail"
       subject_template: "[%{email_prefix}] Confirme seu novo endereço de e-mail"
+      text_body_template: |
+        Confirme o seu novo endereço de e-mail para %{site_name} ao clicar no link a seguir:
+
+        %{base_url}/u/confirm-new-email/%{email_token}
+
+        Caso não tenha solicitado esta alteração, entre em contato com um(a) [administrador(a) do site](%{base_url}/about).
     confirm_new_email_via_admin:
       title: "Confirmar novo e-mail"
       subject_template: "[%{email_prefix}] Confirme seu novo endereço de e-mail"
+      text_body_template: |
+        Confirme o seu novo endereço de e-mail para %{site_name} ao clicar no link a seguir:
+
+        %{base_url}/u/confirm-new-email/%{email_token}
+
+        Esta alteração foi solicitada pelo(a) administrador(a) do site.
+
+        Caso não tenha solicitado esta alteração, entre em contato com um(a) [administrador(a) do site](%{base_url}/about).
     confirm_old_email:
       title: "Confirmar antigo e-mail"
       subject_template: "[%{email_prefix}] Confirme seu endereço de e-mail atual"
       text_body_template: "Antes de podermos alterar seu endereço de e-mail, precisamos confirmar que você \ncontrola a conta de e-mail atual. Depois de concluir esta etapa, solicitaremos que você \nconfirme o novo endereço de e-mail.\n\nConfirme seu endereço de e-mail atual para %{site_name} clicando no seguinte link: \n\n%{base_url}/u/confirm-old-email/%{email_token}\n"
     confirm_old_email_add:
+      title: "Confirmar antigo e-mail (adicionar)"
       subject_template: "[%{email_prefix}] Confirme seu endereço de e-mail atual"
+      text_body_template: "Antes de podermos adicionar um novo endereço de e-mail, precisamos confirmar que você \ncontrola a conta de e-mail atual. Depois de concluir esta etapa, solicitaremos que você \nconfirme o novo endereço de e-mail.\n\nConfirme seu endereço de e-mail atual para %{site_name} clicando no seguinte link: \n\n%{base_url}/u/confirm-old-email/%{email_token}\n"
     notify_old_email:
       title: "Notificar e-mail antigo"
       subject_template: "[%{email_prefix}] Seu endereço de e-mail foi alterado"
@@ -2880,6 +3433,17 @@ pt_BR:
 
         Seu endereço de e-mail foi modificado para:
 
+        %{new_email}
+    notify_old_email_add:
+      title: "Notificar e-mail antigo (adicionar)"
+      subject_template: "[%{email_prefix}] Um novo endereço de e-mail foi adicionado"
+      text_body_template: |
+        Esta é uma mensagem automática para avisar que um endereço de e-mail para
+        %{site_name} foi adicionado. Caso tenha sido um erro, entre em contato
+        com um(a) administrador(a) do site.
+
+        Seu endereço de e-mail foi modificado para:
+
         %{new_email}
     signup_after_approval:
       title: "Inscrição após aprovação"
@@ -2899,6 +3463,13 @@ pt_BR:
         Acreditamos em [comportamento comunitário saudável](%{base_url}/diretrizes) em todos os momentos.
 
         Aproveite sua visita!
+    signup_after_reject:
+      title: "Criar conta após rejeição"
+      subject_template: "Você foi rejeitado(a) em %{site_name}"
+      text_body_template: |
+        Um membro da equipe rejeitou a sua conta em %{site_name}.
+
+        %{reject_reason}
     signup:
       title: "Criar conta"
       subject_template: "[%{email_prefix}] Confirme sua nova conta"
@@ -2937,6 +3508,14 @@ pt_BR:
         Caso contrário, [revise suas sessões existentes](%{base_url}/my/preferences/account) e considere alterar sua senha.
     post_approved:
       title: "Sua postagem foi aprovada"
+      subject_template: "[%{site_name}] Sua postagem foi aprovada"
+      text_body_template: |
+        Olá,
+
+        Esta é uma mensagem automática de %{site_name} para avisar que [sua postagem](%{base_url}%{post_url}) foi aprovada.
+  page_forbidden:
+    title: "Ops! Essa página é privada."
+  site_setting_missing: "O site %{name} precisa ser configurado."
   page_not_found:
     title: "Oops! Essa página não existe ou é privada."
     popular_topics: "Mais acessados(as)"
@@ -2964,6 +3543,7 @@ pt_BR:
     file_missing: "Desculpe, você deve fornecer um arquivo para upload."
     empty: "Desculpe, mas o arquivo que você forneceu está vazio."
     png_to_jpg_conversion_failure_message: "Ocorreu um erro ao converter PNG em JPG."
+    optimize_failure_message: "Ocorreu um erro ao otimizar a imagem enviada."
     attachments:
       too_large: "Desculpe, o arquivo que você está tentando enviar é muito grande (o tamanho máximo é de %{max_size_kb} KB)."
     images:
@@ -2993,22 +3573,31 @@ pt_BR:
     user_email_user_suspended: "o(a) usuário(a) foi suspenso(a)"
     user_email_already_read: "o(a) usuário(a) já leu esta postagem"
     user_email_access_denied: "o(a) usuário(a) não tem permissão para ver esta postagem"
+    user_email_no_email: "Nenhum e-mail associado com a id de usuário(a) %{user_id}"
     sender_message_blank: "mensagem está em branco"
     sender_message_to_blank: "message.to está em branco"
     sender_text_part_body_blank: "text_part.body está em branco"
     sender_body_blank: "o corpo está em branco"
     sender_post_deleted: "a postagem foi excluída"
     sender_message_to_invalid: "o destinatário tem o endereço de e-mail inválido"
+    sender_topic_deleted: "o tópico foi excluído"
+    group_smtp_post_deleted: "a postagem foi excluída"
+    group_smtp_topic_deleted: "o tópico foi excluído"
+    group_smtp_disabled_for_group: "o smtp foi desativado para o grupo"
   color_schemes:
     base_theme_name: "Base"
     light: "Claro"
     dark: "Escuro"
     neutral: "Neutro"
-    grey_amber: "Âmbar cinza"
+    grey_amber: "Âmbar cinzento"
     shades_of_blue: "Tons de azul"
     latte: "Latte"
     summer: "Verão"
-    dark_rose: "Rosa Escura"
+    dark_rose: "Rosa-escuro"
+    wcag: "WCAG claro"
+    wcag_theme_name: "WCAG claro"
+    wcag_dark: "WCAG escuro"
+    wcag_dark_theme_name: "WCAG escuro"
     default_theme_name: "Padrão"
     light_theme_name: "Claro"
     dark_theme_name: "Escuro"
@@ -3017,18 +3606,288 @@ pt_BR:
     shades_of_blue_theme_name: "Tons de azul"
     latte_theme_name: "Latte"
     summer_theme_name: "Verão"
-    dark_rose_theme_name: "Rosa Escura"
+    dark_rose_theme_name: "Rosa-escuro"
   edit_this_page: "Editar esta página"
   csv_export:
     boolean_yes: "Sim"
     boolean_no: "Não"
-    rate_limit_error: "Postagens podem ser baixadas somente uma vez por dia, por favor tente novamente amanhã."
+    rate_limit_error: "Postagens podem ser baixadas somente uma vez por dia, tente novamente amanhã."
   static_topic_first_reply: |
     Altere o primeiro post desse tópico para mudar seu conteúdo na página de %{page_name}
   guidelines_topic:
-    title: "Perguntas frequentes/Diretrizes"
+    title: "Perguntas frequentes/diretrizes"
+    body: |
+      <a name="civilized"></a>
+
+      ## [Este é um local civilizado para discussões públicas](#civilizado)
+
+      Trate este fórum de discussão com o mesmo respeito que você teria por um parque público. Nós também somos um recurso de comunidade compartilhado &mdash; um local para partilhar habilidades, conhecimento e interesses por meio de conversas em tempo real.
+
+      Estas regras importantes não são difíceis. São diretrizes para auxiliar nas decisões humanas da nossa comunidade e manter este ambiente educado e amigável para uma discussão pública saudável.
+
+      <a name="improve"></a>
+
+      ## [Melhore a discussão](#melhorar)
+
+      Ajude-nos a transformar este local em um lugar incrível para debates sempre fazendo contribuições para a discussão, por menor que sejam. Se não tiver certeza se a sua postagem contribui para a conversa, repense a mensagem e tente novamente.
+
+      Uma maneira de melhorar a discussão é procurar conversas em andamento. Dedique um pouco de tempo para navegar pelos tópicos aqui antes de responder ou começar o seu, você terá mais chance de conhecer pessoas com interesses parecidos.
+
+      Os tópicos discutidos aqui são importantes, e queremos que você também ache isso. Tenha respeito com os assuntos e seus debatedores, mesmo que discorde em algum ponto.
+
+      <a name="agreeable"></a>
+
+      ## [Seja sensato(a), mesmo ao discordar](#sentatez)
+
+      Você pode desejar responder ao discordar. Tudo bem. Mas lembre-se de _criticar ideias, não pessoas_. Evite:
+
+      * Chamar pelo nome
+      * Ataques ad hominem
+      * Responder ao tom do(a) usuário(a) em vez do conteúdo
+      * Contradição impulsiva
+
+      Proporcione informações relevantes para melhorar a conversa.
+
+      <a name="participate"></a>
+
+      ## [Sua participaçao conta](#participar)
+
+      As conversas daqui dão o tom para todos(as) os participantes novos do fórum. Ajude-nos a influenciar o futuro desta comunidade ao escolher participar de discussões que tornam este fórum um local interessante&mdash; e evitando as que não são.
+
+      O Discourse fornece ferramentas que permitem que a comunidade identifique coletivamente as melhores (e piores) contribuições: favoritos, curtidas, sinalizadores, respostas, edições, acompanhamento, silenciamento e muito mais. Use essas ferramentas para melhorar a sua experiência e a de todos(as).
+
+      Vamos tornar a nossa comunidade cada vez melhor.
+
+      <a name="flag-problems"></a>
+
+      ## [Se vir um problema, use um sinalizador](#sinalizar-problemas)
+
+      Moderadores(as) têm uma autoridade especial: são responsáveis pelo fórum. E você também. Com a sua ajuda, os(as) moderadores(as) podem agir como facilitadores da comunidade, não zeladores ou policiais.
+
+      Ao constar uma atitude ruim, não responda. Responder encoraja atitudes ruins dando destaque a elas, consome energia e desperdiça o tempo de todos(as). _Apenas sinalize_. Se houver sinalizadores suficientes, medidas serão tomadas automaticamente ou pela intervenção do(a) moderador(a).
+
+      Para manter a nossa comunidade, os moderadores(as) reservam o direito de remover conteúdos e contas de usuário(a) a qualquer momento. Moderadores(as) não preveem novas postagens nem assumem, junto com operadores de site, a responsabilidade por qualquer conteúdo postado pela comunidade.
+
+      <a name="be-civil"></a>
+
+      ## [Educação sempre](#educação)
+
+      Nada sabota mais uma conversa saudável do que grosseria:
+
+      * Tenha educação. Não poste nada que uma pessoa sensata consideraria ofensivo, abusivo ou discurso de ódio.
+      * Tenha respeito sempre. Não poste nada obsceno ou com sexualidade explícita.
+      * Tenha respeito mútuo. Não assedie, magoe, ou se passe por alguém, nem exponha suas informações privadas.
+      * Respeite o nosso fórum. Não poste spam ou vandalize.
+
+      Estes termos não são invariáveis com definições exatas &mdash; evite o _surgimento_ de qualquer um dos comportamentos mencionados. Se não tiver certeza, pergunte a si como você se sentiria se a sua postagem fosse exibida na página principal de um importante site de notícias.
+
+      Este é um fórum público, e mecanismos de busca indexam estas discussões. Mantenha a linguagem, links e imagens seguras para a família e amigos.
+
+      <a name="keep-tidy"></a>
+
+      ## [Organização em primeiro lugar](#organização)
+
+      Faça de tudo para manter as coisas no seu devido lugar, para que possamos passar mais tempo debatendo e menos tempo organizando. Por isso:
+
+      * Não inicie um tópico na categoria errada. Leia as categorias.
+      * Não faça postagens cruzadas da mesma coisa em vários tópicos.
+      * Não poste respostas sem conteúdo.
+      * Não desvie do tópico durante o debate.
+      * Não assine suas postagens&mdash; todas as postagens incluem as informações do seu perfil.
+
+      Em vez de postar “+1” ou “Concordo”, use o botão Curtir. Em vez de mudar o rumo de um tópico existente, use Responder como tópico vinculado.
+
+      <a name="stealing"></a>
+
+      ## [Poste o seu conteúdo](#roubo)
+
+      Não é possível postar nada digital que pertence a outra pessoa sem permissão. Você não pode postar descrições, links ou métodos para roubar propriedade intelectual (software, vídeo, áudio, imagens), ou para violar alguma outra lei.
+
+      <a name="power"></a>
+
+      ## [Desenvolvido por você](#desenvolvimento)
+
+      Este site é operado pela sua [prestativa equipe local](%{base_path}/about) e *você*, a comunidade. Caso tenha mais perguntas sobre como as coisas devem funcionar, abra um tópico na [categoria de comentários do site](%{base_path}/c/site-feedback) para debatermos! Se houver algum assunto urgente ou vital que não possa ser tratado por um metatópico ou sinalizador, entre em contato conosco pela [página da equipe](%{base_path}/about).
+
+      <a name="tos"></a>
+
+      ## [Termos de serviço](#tos)
+
+      Sim, burocracia é chata, mas precisamos nos proteger &ndash; e, consequentemente, proteger a sua pessoa e seus dados&ndash; contra ataques hostis. Os nossos [Termos de Serviço](%{base_path}/tos) descrevem o seu (e o nosso) comportamento e os direitos referentes a conteúdo, privacidade e legislação. Para usar este serviço, você precisa concordar em obedecer aos nossos [TOS](%{base_path}/tos).
   tos_topic:
     title: "Termos de Serviço"
+    body: |
+      Estes termos regem o uso do fórum da internet em <%{base_url}>. Para usar o fórum, você deve concordar os termos da %{company_name}, a empresa que administra o fórum.
+
+      A empresa pode oferecer outros produtos e serviços com termos diferentes. Estes termos se aplicam apenas ao uso do fórum.
+
+      Pular para :
+
+      - [Termos importantes](#título--termos importantes)
+      - [Sua permissão para usar o fórum](#título--permissão)
+      - [Condições para usar o fórum](#título--condições)
+      - [Uso aceitável](#título--uso aceitável)
+      - [Padrões de conteúdo](##título--padrões-conteúdo)
+      - [Enforcement](#título--aplicação)
+      - [Sua conta](#título--sua conta)
+      - [Seu conteúdo](#título--seu-conteúdo)
+      - [Sua responsabilidade](#título--responsabilidade)
+      - [Disclaimers](#título--isenção)
+      - [Limites de responsabilidade](#título--responsabilidade)
+      - [Feedback](#título--comentários)
+      - [Termination](#título--encerramento)
+      - [Disputes](#título--disputas)
+      - [Termos gerais](#título--geral)
+      - [Contact](#título--contato)
+      - [Changes](#título--alterações)
+
+      <h2 id="heading--important-terms"><a href="#heading--important-terms">Termos importantes</a></h2>
+
+      ***Estes termos incluem uma quantidade importante de provisões que afetam seus direitos e responsabilidades, como a isenção de responsabilidade[Disclaimers](#título--isenção), limites da responsabilidade da empresa [Limites de responsabilidade](#título--responsabilidade), seu contrato para abranger a empresa quanto a danos causados por problemas de uso do fórum em [Responsabilidade pelo seu uso](#título--responsabilidade), além de um contrato de arbitragem de disputas em [Disputes](#título--disputas).***
+
+      <h2 id="heading--permission"><a href="#heading--permission">Sua permissão para usar o fórum</a></h2>
+
+      Sujeita a estes termos, a empresa concede permissão para usar o fórum. Todos(as) precisam concordar com estes termos para usar o fórum.
+
+      <h2 id="heading--conditions"><a href="#heading--conditions">Condições para usar o fórum</a></h2>
+
+      Sua permissão para usar o fórum está sujeita às condições a seguir:
+
+      1. É preciso ter pelo menos 30 anos de idade.
+
+      2. Você não pode mais usar o fórum se a empresa entrar em contato diretamente para revogar a sua permissão.
+
+      3. Você deve usar o fórum de acordo com o [Uso aceitável](#título--uso-aceitável) e os [Padrões de conteúdo](#título--padrões-de-conteúdo).
+
+      <h2 id="heading--acceptable-use"><a href="#heading--acceptable-use">Uso aceitável</a></h2>
+
+      1. Você não pode violar a lei usando este fórum.
+
+      2. Você não pode usar ou tentar usar a conta de outros(as) usuários(as) seu permissão.
+
+      3. Você não pode comprar, vender ou trocar nomes de usuário(a) ou outros identificadores exclusivos no fórum.
+
+      4. Você não pode enviar anúncios, correntes de e-email ou outras solicitações pelo fórum, ou usar o fórum para coletar endereços ou dados pessoais para listas de endereçamento comerciais ou bancos de dados.
+
+      5. Você não pode automatizar o acesso ao fórum, nem monitorar o fórum, usando recursos como rastreadores de rede, plug-ins de navegador ou outro programa de computador diferente de um navegador. Você pode rastrear o fórum para indexá-lo em um mecanismo de busca disponível para publicidade, caso administre um.
+
+      6. Você não pode usar o fórum para enviar listas de distribuição de e-mails, grupos de notícias ou apelidos de e-mail de grupo.
+
+      7. Você não pode implicar falsamente que está afiliado(a) ou que tem com o apoio da empresa.
+
+      8. Você não pode criar links para imagens ou conteúdo de fóruns em outras páginas.
+
+      9. Você não pode remover marcas de propriedade de materiais baixados no fórum.
+
+      10. Você não pode mostrar nenhuma parte do fórum em oturos sites com "<iframe>".
+
+      11. Você não pode desativar, evitar ou burlar restrições de acesso ou segurança do fórum.
+
+      12. Você não pode sobrecarregar a infraestrutura do fórum com um volume absurdo de pedidos, ou pedidos elaborados para impor uma carga excessiva aos sistemas de informações do fórum.
+
+      13. Você não pode se passar por outras pessoas por meio do fórum.
+
+      14. Você não pode incentivar ou ajudar na violação destes termos.
+
+      <h2 id="heading--content-standards"><a href="#heading--content-standards">Content Standards</a></h2>
+
+      1. Você não pode enviar conteúdo ao fórum que seja ilegal, ofensivo ou nocivo às outras pessoas. Isso inclui assédio, abuso e conteúdo inapropriado.
+
+      2. Você não pode enviar conteúdo ao fórum que viole a lei, infrinja direitos de propriedade intelectual ou desobedeça contratos com outras pessoas ou empresas.
+
+      3. Você não pode enviar conteúdo ao fórum contendo código maliciosos, como vírus ou spyware.
+
+      4. Você não pode enviar conteúdo ao fórum como variável para reservar um endereço, nome de usuário(a) ou outro identificador exclusivo.
+
+      5. Você não pode usar o fórum para revelar informações que você não tem direito de revelar, como dados pessoais ou confidenciais de outras pessoas.
+
+      <h2 id="heading--enforcement"><a href="#heading--enforcement">Aplicação</a></h2>
+
+      A empresa pode investigar e processar violações destes termos com todos os recursos jurídicos disponíveis. Pode notificar e cooperar com autoridades de aplicação da lei ao verificar violações da lei e destes termos.
+
+      A empresa reserva o direito de alterar, redigir e excluir conteúdo do fórum por qualquer motivo. Se você acredita que alguém tenha enviado conteúdo ao fórum violando estes termos, [entre em contato conosco imediatamente](#título--contato).
+
+      <h2 id="heading--your-account"><a href="#heading--your-account">Sua conta</a></h2>
+
+      Você deve criar e entrar com a conta para usar alguns recursos do fórum.
+
+      Para criar uma conta, forneça algumas informações sobre você. Se criar uma conta, você concorda em fornecer pelo menos um endereço de e-mail válido e mantê-lo atualizado. É possível encerrar a conta a qualquer momento enviando um e-mail para <%{contact_email}>.
+
+      Você concorda em assumir responsabilidade total por todas as ações realizadas por meio da sua conta, com ou sem a sua autorização, até o encerramento ou a notificação por parte da empresa de que ela foi comprometida. Você concorda em notificar a empresa imediatamente em caso de suspeita de comprometimento da conta, além de escolher uma senha segura e mantê-la em segredo..
+
+      A empresa pode restringir, suspender ou encerrar a sua conta no fórum de acordo com sua política de tratamento de solicitações de remoção por direitos autorais, ou se for considerado que você violou qualquer regra destes termos.
+
+      <h2 id="heading--your-content"><a href="#heading--your-content">Seu conteúdo</a></h2>
+
+      Nada nestes termos dá à empresa direitos de propriedade de propriedade intelectual que você compartilha com o fórum, como informações da conta, postagens ou outro conteúdo enviado. Nada nestes termos concede direitos de propriedade na propriedade intelectual da empresa.
+
+      Entre você e a empresa, você assume a responsabilidade apenas pelo conteúdo que você enviou ao fórum. Você concorda em não implicar falsamente que o conteúdo enviado ao fórum foi patrocinado ou aprovado pela empresa. Estes temos não obrigam a empresa a armazenar, manter ou fornecer cópias do conteúdo enviado, nem a alterá-lo de conforme estes termos.
+
+      O conteúdo que você enviar ao fórum pertence a você, bem como a decisão sobre as permissões concedidas aos outros(as) usuários(as) em relação ao conteúdo. Mas você autoriza a empresa a fornecer o conteúdo enviado ao fórum para outros(as) usuários(as). Essa autorização especial permite que a empresa copie, publique e analise o conteúdo enviado ao fórum.
+
+      Quando o conteúdo enviado é removido do fórum, por você ou pela empresa, a autorização especial da empresa encerra assim que a última cópia desaparece dos backups, caches e outros sistemas da empresa. Outras licenças que você aplicar ao conteúdo, como as do [Creative Commons](https://creativecommons.org), podem permanecer após a remoção. Essas licenças podem conceder aos(às) outros(as), ou à própria empresa, o direito de compartilhar o seu conteúdo outra vez por meio do fórum.
+
+      Outros(as) que receberem o conteúdo enviado ao fórum podem violar os termos pelos quais você licencia o seu conteúdo. Você concorda que a empresa não será responsável para você por essas violações ou suas consequências.
+
+      <h2 id="heading--responsibility"><a href="#heading--responsibility">Sua responsabilidade</a></h2>
+
+      Você concorda em indemnizar a empresa por processos legais de outros(as) relacionados à violação destes termos, ou violação destes termos por parte de outros(as) usando a sua conta no fórum. Você e a empresa concordam em notificar a outra parte sobre processos legais pelos quais você precisa indemnizar a empresa o mais rápido possível. Se a empresa não notificar sobre um processo legal imediatamente, você não precisará indemnizar a empresa por danos contra os quais você poderia ter se defendido ou mitigado com aviso. Você concorda em permitir que a empresa controle a investigação, defesa e resolução de processos legais pelos quais você precisaria indemnizar a empresa e cooperar com esses esforços. A empresa concorda em não aceitar nenhuma resolução que admita a culpa por você ou impõe obrigações sem acordo prévio.
+
+      <h2 id="heading--disclaimers"><a href="#heading--disclaimers">Isenção de responsabilidade</a></h2>
+
+      ***Você aceita todo o risco de usar o fórum e o seu conteúdo. Até o limite da lei, a empresa e seus fornecedores proporcionam o fórum assim como está, sem nenhum tipo de garantia.***
+
+      O fórum pode vincular e integrar fóruns e serviços de terceiros. A empresa não oferece nenhuma garantia sobre esses serviços de terceiros ou o conteúdo que possam fornecer. O uso dos serviços de terceiros podem ser regido por outros termos entre você e o administrador do serviço.
+
+      <h2 id="heading--liability"><a href="#heading--liability">Limites de responsabilidade</a></h2>
+
+      ***Nem a empresa nem seus fornecedores serão responsáveis por você referente a violações de contrato não previstas por seus funcionários ao concordar com estes termos.***
+
+      ***Até o limite da lei, a sua responsabilidade total por qualquer tipo de processo relacionado ao fórum, ou ao seu conteúdo, será limitada a US$ $50.***
+
+      <h2 id="heading--feedback"><a href="#heading--feedback">Comentários</a></h2>
+
+      A empresa recebe seus comentários e sugestões para o fórum. Confira a seção [Contact](#título--contato) abaixo para saber como entrar em contato conosco.
+
+      Você concorda que a empresa tem liberdade para agir em relação aos comentários e sugestões enviados e que ela não precisa notificar ou pagar pelo uso do comentário. Você concorda em não enviar comentários ou sugestões que possam ser confidenciais ou propriedade sua ou de alguém.
+
+      <h2 id="heading--termination"><a href="#heading--termination">Encerramento</a></h2>
+
+      Você ou a empresa pode encerrar o contrato descrito nestes termos a qualquer momento. Ao termino do contrato, você não terá mais permissão para usar o fórum.
+
+      As provisões a seguir permanecem após o fim do contrato: [Seu conteúdo](#título--seu-conteúdo), [Feedback](#título--comentários), [Sua responsabilidade](#título--responsabilidade), [Disclaimers](#título--isenção), [Limites de responsabilidade](#título--responsabilidade) e [Termos gerais](#título--geral).
+
+      <h2 id="heading--disputes"><a href="#heading--disputes">Disputes</a></h2>
+
+      %{governing_law} irá reger qualquer disputa relacionada a estes termos ou uso do fórum.
+
+      Você e a empresa concordam em buscar medidas liminares relacionadas a estes termos apenas em tribunais estaduais e federais em %{city_for_disputes}. Nem você ou a empresa contestarão a jurisdição, fórum ou julgamentos nesses tribunais.
+
+      ***Além de buscar medidas liminares ou processos sob a Computer Fraud e o Abuse Act, você e a empresa solucionarão disputas ao vincular a arbitragem da American Arbitration Association. A arbitragem seguirá as regras da Commercial Arbitration Rules da AAA e a Supplementary Procedures para disputas relacionadas ao cliente. A arbitragem ocorrerá em %{city_for_disputes}. Você solucionará qualquer disputa de forma individual, não como parte de ação de classe ou outro procedimento representativo, seja como requerente ou o membro de uma classe. Nenhum árbitro consolidará disputas com outra arbitragem sem a permissão da empresa.***
+
+      Qualquer sentença de arbitragem incluirá os seus custos, taxas razoáveis de advogados e custos razoáveis para as testemunhas. Você e a empresa podem iniciar a sentença arbitral em qualquer tribunal com jurisdição.
+
+      <h2 id="heading--general"><a href="#heading--general">Termos gerais</a></h2>
+
+      Se a provisão destes termos não puderem ser aplicadas como descrito, mas podem ser alteradas para serem aplicadas, ela deve ser alterada o mínimo possível para torná-la aplicável. Caso contrário, será removida .
+
+      Você não pode transferir o seu contato com a empresa. A empresa transferir o seu contrato para qualquer filial ou outras empresas que obtiverem controle da empresa, ou que comprarem ativos da empresa relacionados ao fórum. Qualquer transferência não inclusas nestes termos não tem efeito legal.
+
+      Nem o exercício de qualquer direito sob este contrato, nem a renúncia de qualquer violação deste contrato, implicam a desistência de outras violações deste contrato.
+
+      Estes termos abrangem todos os termos do contrato entre você e a empresa sobre o uso do fórum. Estes termos substituem totalmente os outros termos sobre o seu uso do fórum, escritos ou não.
+
+      <h2 id="heading--contact"><a href="#heading--contact">Contato</a></h2>
+
+      Você pode notificar a empresa sob estes termos e enviar perguntas em <%{contact_email}>.
+
+      A empresa pode notificar sobre estes termos usando o endereço de e-mail informado na sua conta do fórum, ou postando uma mensagem na página inicial do fórum ou na de sua conta.
+
+      <h2 id="heading--changes"><a href="#heading--changes">Alterações</a></h2>
+
+      A atualização mais recente destes termos ocorrem em 12 de julho de 2018, sendo que poderão ser atualizados novamente. A empresa postará todas as atualizações do fórum. Para atualizações que contêm alterações substanciais, a empresa concorda em enviar um e-mail, caso você tenha criado uma conta e fornecido um endereço de e-mail válido. A empresa também pode anunciar atualizações com mensagens especiais ou alertas no fórum.
+
+      Ao receber notificações sobre uma atualização destes termos, você deve concordar com os novos termos para continuar a usar o fórum.
   privacy_topic:
     title: "Política de Privacidade"
     body: |
@@ -3036,28 +3895,28 @@ pt_BR:
 
       ## [Quais informações coletamos?] (# Coletar)
 
-      Coletamos informações de você quando você se registra em nosso site e coletamos dados quando você participa do fórum lendo, escrevendo e avaliando o conteúdo compartilhado aqui.
+      Coletamos informações quando você se cadastra no nosso site e coletamos dados quando você participa do fórum lendo, escrevendo e avaliando o conteúdo compartilhado aqui.
 
-      Ao se registrar em nosso site, você pode ser solicitado a digitar seu nome e endereço de e-mail. Você pode, no entanto, visitar o nosso site sem se registrar. Seu endereço de e-mail será verificado por um e-mail contendo um link exclusivo. Se esse link for visitado, sabemos que você controla o endereço de e-mail.
+      Ao se cadastrar no nosso site, pode ser solicitado que você digite seu nome e endereço de e-mail. É possível, no entanto, acessar sem se cadastrar. Seu endereço de e-mail será verificado com um e-mail contendo um link exclusivo. Se esse link for acessado, saberemos que você controla o endereço de e-mail.
 
-      Quando registrado e postando, nós registramos o endereço IP de onde a postagem se originou. Também podemos reter logs do servidor, que incluem o endereço IP de cada solicitação para o nosso servidor.
+      Ao se cadastrar e postar, registramos o endereço IP de onde a postagem se originou. Também podemos manter registros do servidor, que incluem o endereço IP de cada solicitação para o nosso servidor.
 
       <a name="use"></a>
 
       ## [Para que usamos suas informações?] (# Use)
 
-      Qualquer informação que coletamos de você pode ser usada de uma das seguintes formas:
+      Qualquer informação coletada pode ser usada de uma das seguintes formas:
 
-      * Para personalizar sua experiência & mdash; suas informações nos ajudam a responder melhor às suas necessidades individuais.
-      * Para melhorar nosso site & mdash; nos esforçamos continuamente para melhorar nossas ofertas de sites com base nas informações e comentários que recebemos de você.
-      * Para melhorar o atendimento ao cliente & mdash; suas informações nos ajudam a responder com mais eficácia às suas solicitações de atendimento ao cliente e às necessidades de suporte.
-      * Para enviar emails periódicos & mdash; O endereço de e-mail que você fornece pode ser usado para enviar informações, notificações que você solicita sobre alterações em tópicos ou em resposta ao seu nome de usuário, responder a perguntas e / ou outras solicitações ou perguntas.
+      * Para personalizar sua experiência &mdash; suas informações nos ajudam a atender melhor suas necessidades individuais.
+      * Para melhorar nosso site &mdash; nos esforçamos continuamente para melhorar nossas ofertas de sites com base nas informações e comentários que recebemos de você.
+      * Para melhorar o atendimento ao cliente &mdash; suas informações nos ajudam a responder com mais eficácia às suas solicitações de atendimento ao cliente e a atender necessidades de suporte.
+      * Para enviar e-mails periódicos &mdash; o endereço de e-mail que você informa pode ser usado para enviar informações, notificações solicitadas sobre alterações em tópicos ou respostas vinculadas ao seu nome de usuário(a), responder a perguntas e/ou outras solicitações ou dúvidas.
 
       <a name="protect"></a>
 
-      ## [Como protegemos suas informações?] (# Protect)
+      ## [Como protegemos suas informações?] (#protect)
 
-      Implementamos uma variedade de medidas de segurança para manter a segurança de suas informações pessoais quando você insere, envia ou acessa suas informações pessoais..
+      Implementamos uma variedade de medidas de segurança para manter a segurança de suas informações pessoais quando você as insere, envia ou acessa.
 
       <a name="data-retention"></a>
 
@@ -3065,63 +3924,66 @@ pt_BR:
 
       Faremos um esforço de boa fé para:
 
-      * Manter logs do servidor contendo o endereço IP de todas as solicitações para esse servidor por no máximo 90 dias.
-      * Manter os endereços IP associados aos usuários registrados e suas postagens não mais que 5 anos.
+      * Manter os registros do servidor contendo o endereço IP de todas as solicitações para esse servidor por no máximo 90 dias.
+      * Manter os endereços IP associados aos(às) usuários(as) cadastrados(as) e suas postagens por menos de cinco anos.
 
       <a name="cookies"></a>
 
-      ## [Nós usamos cookies?] (# Cookies)
+      ## [Nós usamos cookies?] (#cookies)
 
-      Sim. Cookies são pequenos arquivos que um site ou seu provedor de serviços transfere para o disco rígido do seu computador através do navegador da Web (se você permitir). Esses cookies permitem que o site reconheça seu navegador e, se você tiver uma conta registrada, associe-a à sua conta registrada.
+      Sim. Cookies são pequenos arquivos que um site ou seu provedor de serviços transfere para o disco rígido do seu computador pelo navegador (se você permitir). Esses cookies permitem que o site reconheça seu navegador e, se você tiver uma conta cadastrada, o associe à sua conta registrada.
 
-      Usamos cookies para entender e salvar suas preferências para futuras visitas e compilar dados agregados sobre o tráfego do site e a interação no site para que possamos oferecer melhores experiências e ferramentas ao site no futuro. Podemos contratar prestadores de serviços terceirizados para nos ajudar a entender melhor os visitantes do nosso site. Esses provedores de serviços não têm permissão para usar as informações coletadas em nosso nome, exceto para nos ajudar a conduzir e melhorar nossos negócios.
+      Usamos cookies para entender e salvar suas preferências para as próximas visitas e compilar os dados agregados sobre tráfego e interação no site para que possamos proporcionar melhores experiências e ferramentas ao site no futuro. Podemos contratar prestadores de serviços terceirizados para nos ajudar a entender melhor os visitantes do nosso site. Esses prestadores de serviços não têm permissão para usar as informações coletadas em nosso nome, exceto para nos ajudar a conduzir e melhorar nossos negócios.
 
       <a name="disclose"></a>
 
-      ## [Nós divulgamos qualquer informação a terceiros?] (# Divulgue)
+      ## [Nós divulgamos qualquer informação a terceiros?] (#divulgue)
 
-      Nós não vendemos, comercializamos ou transferimos de outra forma para terceiros suas informações pessoalmente identificáveis. Isso não inclui terceiros confiáveis ​​que nos auxiliam a operar nosso site, conduzir nossos negócios ou prestar serviços a você, desde que essas partes concordem em manter essas informações confidenciais. Também podemos liberar suas informações quando acreditarmos que a divulgação é apropriada para cumprir a lei, aplicar as políticas do nosso site ou proteger os direitos, propriedade ou segurança da nossa empresa ou de terceiros. No entanto, informações de visitantes não pessoalmente identificáveis ​​podem ser fornecidas a terceiros para fins de marketing, publicidade ou outros usos.
+      Nós não vendemos, comercializamos ou transferimos de outra forma para terceiros suas informações pessoalmente identificáveis. Isso não inclui terceiros confiáveis ​​que nos auxiliam a operar nosso site, conduzir nossos negócios ou prestar serviços a você, desde que as partes concordem em manter essas informações confidenciais. Também podemos liberar suas informações quando acreditarmos que a divulgação é apropriada para cumprir a lei, aplicar as políticas do nosso site ou proteger os direitos, propriedade ou segurança da nossa empresa ou de terceiros. No entanto, informações de visitantes não pessoalmente identificáveis ​​podem ser fornecidas a terceiros para fins de marketing, publicidade ou outros usos.
 
       <a name="third-party"></a>
 
-      ## [Links de terceiros] (# terceiros)
+      ## [Links de terceiros] (#terceiros)
 
-      Ocasionalmente, a nosso critério, podemos incluir ou oferecer produtos ou serviços de terceiros em nosso site. Esses sites de terceiros possuem políticas de privacidade separadas e independentes. Portanto, não temos responsabilidade nem obrigação pelo conteúdo e atividades desses sites vinculados. No entanto, procuramos proteger a integridade do nosso site e agradecemos qualquer feedback sobre esses sites.
+      Ocasionalmente, a nosso critério, podemos incluir ou oferecer produtos ou serviços de terceiros em nosso site. Esses sites de terceiros têm políticas de privacidade separadas e independentes. Portanto, não temos responsabilidade nem obrigação em relação ao conteúdo e atividades desses sites vinculados. No entanto, procuramos proteger a integridade do nosso site e agradecemos qualquer comentário sobre esses sites.
 
       <a name="coppa"></a>
 
-      ## [Cumprimento da Lei de Proteção à Privacidade Online das Crianças] (#coppa)
+      ## [Cumprimento da Lei de Proteção à Privacidade On-line das Crianças] (#coppa)
 
-      Nosso site, produtos e serviços são direcionados para pessoas com pelo menos 13 anos de idade ou mais. Se este servidor estiver nos EUA e você tiver menos de 13 anos, de acordo com os requisitos da COPPA (https://en.wikipedia.org/wiki/Children_Online_Privacy_Privection_Act), não use esse site.
+      Nosso site, produtos e serviços são direcionados para pessoas com pelo menos 13 anos de idade. Se este servidor estiver nos EUA e você tiver menos de 13 anos, de acordo com os requisitos da COPPA (https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act), não use este site.
 
       <a name="online"></a>
 
-      ## [Política de Privacidade Online Apenas] (#online)
+      ## [Apenas Política de Privacidade On-line] (#online)
 
-      Esta política de privacidade on-line se aplica somente a informações coletadas por meio de nosso site e não a informações coletadas off-line.
+      Esta política de privacidade on-line se aplica somente a informações coletadas pelo nosso site e não a informações coletadas off-line.
 
       <a name="consent"></a>
 
       ## [Seu consentimento] (#consentimento)
 
-      Ao utilizar o nosso site, você concorda com a política de privacidade do nosso site..
+      Ao utilizar o nosso site, você concorda com a nossa política de privacidade.
 
       <a name="changes"></a>
 
       ## [Alterações à nossa Política de Privacidade] (#alterações)
 
-      Se decidirmos alterar nossa política de privacidade, publicaremos essas alterações nesta página.
+      Se decidirmos alterar nossa política de privacidade, elas serão publicadas nesta página.
 
       Este documento é CC-BY-SA. Última atualização em 31 de maio de 2013.
   badges:
     mass_award:
       errors:
         invalid_csv: Encontramos um erro na linha %{line_number}. Confirme se o CSV possui um e-mail por linha.
+        too_many_csv_entries: Muitas entradas para o arquivo CSV. Forneça um arquivo CSV com no máximo %{count} entradas.
+        badge_disabled: Ative o emblema %{badge_name} primeiro.
+        cant_grant_multiple_times: Não é possível conceder o emblema %{badge_name} várias vezes a um único(a) usuário(a)
     editor:
-      name: Editor
+      name: Editor(a)
       description: Primeira edição de postagem
       long_description: |
-        Esse emblema é concedido na primeira vez que você edita uma de suas postagens. Embora você não possa editar suas postagens depois de muito tempo, a edição é incentivada. Você pode melhorar a formatação, corrigir pequenos erros ou adicionar alguma coisa que tenha esquecido quando postou originalmente. Edite para tornar suas postagens ainda melhores!
+        Este emblema é concedido na primeira vez que você edita uma de suas postagens. Embora não possa editar suas postagens depois de muito tempo, incentivamos a edição. Você pode melhorar a formatação, corrigir pequenos erros ou adicionar alguma coisa que tenha esquecido quando postou pela primeira vez. Faça edições para tornar suas postagens ainda melhores!
     wiki_editor:
       name: Editor de Wiki
       description: Primeira edição de wiki
@@ -3129,16 +3991,16 @@ pt_BR:
         Este emblema é concedido na primeira vez que você edita uma postagem wiki.
     basic_user:
       name: Básico
-      description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">Concedido</a> todas as funções essenciais da comunidade
+      description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">Concedido</a> uso de todas as funções essenciais da comunidade
       long_description: |
         Este emblema é concedido quando você atinge o nível de confiança 1. Obrigado por acompanhar o fórum e ler alguns tópicos para aprender o que é a nossa comunidade. As restrições de novo(a) usuário(a) foram removidas. Você recebeu todos os recursos essenciais, como mensagens pessoais, sinalizadores, edição de wiki e capacidade de postar várias imagens e links.
     member:
       name: Membro
-      description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">Concedido</a> convites, mensagens de grupo, mais curtidas
+      description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">Concedido</a> uso de convites, mensagens de grupo, mais curtidas
       long_description: |
-        Este emblema é concedido quando você atinge o nível de confiança 2. Obrigado por participar durante semanas para se juntar à nossa comunidade completamente. Agora você pode enviar convites a partir de sua página de usuário ou tópicos individuais, criar mensagens pessoais de grupo e ter mais curtidas por dia.
+        Este emblema é concedido quando você atinge o nível de confiança 2. Obrigado por participar durante semanas para se juntar à nossa comunidade. Agora você pode enviar convites pela sua página de usuário(a) ou tópicos individuais, criar mensagens pessoais de grupo e ter mais curtidas por dia.
     regular:
-      name: Habitual
+      name: Regular
       description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">Concedido(s)</a> recategorizar, renomear, links seguidos, wiki, mais curtidas
       long_description: |
         Este emblema é concedido quando você atinge o nível de confiança 3. Obrigado por ser uma parte constante de nossa comunidade há meses. Agora você é um dos leitores(as) mais ativos(as) e um(a) colaborador(a) confiável que torna a nossa comunidade excelente. Já é possível recategorizar e renomear tópicos, utilizar os sinalizadores de spam mais eficientes, acessar uma área de descanso privada e também aproveitar muito mais curtidas por dia.
@@ -3151,29 +4013,29 @@ pt_BR:
       name: Boas-vindas
       description: Recebeu uma curtida
       long_description: |
-        Este emblema é concedido quando você recebe sua primeira curtida numa postagem. Parabéns, você postou algo que sua comunidade achou interessante, legal ou útil!.
+        Este emblema é concedido quando você recebe sua primeira curtida em uma postagem. Parabéns, você postou algo que sua comunidade achou interessante, legal ou útil!
     autobiographer:
       name: Autobiógrafo
       description: Preencheu informações de <a href="%{base_uri}/my/preferences/profile">Perfil</a>
       long_description: |
-        Este emblema é concedido por preencher <a href="%{base_uri}/my/preferences/profile">seu perfil de usuário</a> e selecionar uma foto de perfil. Permitir que a comunidade saiba um pouco mais sobre quem você é e sobre o que você está interessado contribui para uma comunidade melhor e mais conectada. Junte-se a nós!
+        Este emblema é concedido por preencher <a href="%{base_uri}/my/preferences/profile">seu perfil de usuário(a)</a> e selecionar uma foto de perfil. Permitir que saibam um pouco mais sobre quem você é e sobre os seus interesses contribui para uma comunidade melhor e mais conectada. Junte-se a nós!
     anniversary:
       name: Aniversário
       description: Membro ativo por um ano, postou ao menos uma vez
       long_description: |
-        Este emblema é concedido quando você é membro por um ano com pelo menos uma postagem nesse ano. Obrigado por ficar por aqui e contribuir com a nossa comunidade. Nós não poderíamos fazer isso sem você.
+        Este emblema é concedido quando você é membro por um ano com pelo menos uma postagem neste ano. Obrigado por ficar e contribuir para a nossa comunidade. Nosso trabalho não seria possível sem você.
     nice_post:
-      name: Resposta Interessante
-      description: Recebeu 10 curtidas em uma resposta
+      name: Resposta interessante
+      description: Recebeu dez curtidas em uma resposta
       long_description: |
-        Esse emblema é concedido quando sua resposta recebe 10 curtidas. Sua resposta causou uma boa impressão na comunidade e ajudou a levar a conversa adiante.
+        Este emblema é concedido quando sua resposta recebe dez curtidas. Sua resposta causou uma boa impressão na comunidade e ajudou a levar a conversa adiante.
     good_post:
-      name: Boa Resposta
+      name: Resposta boa
       description: Recebeu 25 curtidas em uma resposta
       long_description: |
-        Esse emblema é concedido quando sua resposta recebe 25 curtidas. Sua resposta foi excepcional e tornou a conversa muito mais interessante.
+        Este emblema é concedido quando sua resposta recebe 25 curtidas. Sua resposta foi excepcional e tornou a conversa muito mais interessante.
     great_post:
-      name: Excelente Resposta
+      name: Resposta excelente
       description: Recebeu 50 curtidas em uma resposta
       long_description: |
         Este emblema é concedido quando sua resposta recebe 50 curtidas. Uau! Sua resposta foi inspiradora, fascinante, hilária ou perspicaz, e a comunidade adorou!
@@ -3243,20 +4105,20 @@ pt_BR:
       long_description: |
         Este emblema é concedido na primeira vez que você vincula outro tópico. Vincular tópicos ajuda colegas leitores(as) a encontrar conversas relacionadas interessantes, mostrando as conexões entre os tópicos. Sinta-se livre para adicionar links!
     first_quote:
-      name: Primeira Citação
+      name: Primeira citação
       description: Citou uma postagem
       long_description: |
-        Esse emblema é concedido na primeira vez que você citar uma postagem em uma resposta. Citar partes relevantes de postagens anteriores na sua resposta ajuda a manter as discussões conectadas juntas e a não divergir do tópico. A maneira mais fácil de citar é selecionar uma parte de uma postagem e, em seguida, pressionar qualquer botão de resposta. Cite à vontade!
+        Esse emblema é concedido na primeira vez que você citar uma postagem em uma resposta. Citar partes relevantes de postagens anteriores na sua resposta ajuda a manter as discussões conectadas e a não sair do tópico. A maneira mais fácil de citar é selecionar uma parte de uma postagem e, em seguida, pressionar qualquer botão de resposta. Cite à vontade!
     read_guidelines:
       name: Leu as regras
       description: Leia as <a href="%{base_uri}/guidelines">diretrizes da comunidade</a>
       long_description: |
-        Este emblema é concedido por <a href="%{base_uri}/guidelines">ter lido as diretrizes da comunidade</a>. Seguir e compartilhar essas diretrizes simples ajuda a criar uma comunidade segura, divertida e sustentável para todos. Lembre-se sempre de que há outro ser humano, um muito parecido com você, do outro lado da tela. Seja legal!
+        Este emblema é concedido por <a href="%{base_uri}/guidelines">ter lido as diretrizes da comunidade</a>. Seguir e compartilhar essas diretrizes simples ajuda a criar uma comunidade segura, divertida e sustentável para todos. Sempre Lembre que há outro ser humano muito parecido com você no outro lado da tela. Seja legal!
     reader:
-      name: Leitor
+      name: Leitor(a)
       description: Leu todas as respostas em um tópico com mais de 100 respostas
       long_description: |
-        Esse emblema é concedido na primeira vez que você lê um tópico longo com mais de 100 respostas. Ler uma conversa de perto ajuda você a acompanhar a discussão, entender diferentes pontos de vista e leva a conversas mais interessantes. Quanto mais você lê, melhor a conversa fica. Como gostamos de dizer, a leitura é fundamental! :slight_smile:
+        Este emblema é concedido na primeira vez que você lê um tópico longo com mais de 100 respostas. Ler uma conversa atentamente ajuda a acompanhar a discussão, entender diferentes pontos de vista, além de levar a assuntos mais interessantes. Quanto mais você lê, melhor a conversa fica. Como gostamos de dizer, leitura é fundamental! :slight_smile:
     popular_link:
       name: Link mais acessado
       description: Postou um link externo com 50 cliques
@@ -3264,112 +4126,112 @@ pt_BR:
         Este emblema é concedido quando um link que você compartilhou recebe 50 cliques. Obrigado por postar um link que contribuiu para a discussão!
     hot_link:
       name: Link muito acessado
-      description: Postou um link externo com 300 clicks
+      description: Postou um link externo com 300 cliques
       long_description: |
-        Esse emblema é concedido quando um link compartilhado recebe 300 cliques. Obrigado por postar um link fascinante que levou a conversa adiante e iluminou a discussão!
+        Este emblema é concedido quando um link compartilhado recebe 300 cliques. Obrigado por postar um link fascinante que levou a conversa adiante e iluminou a discussão!
     famous_link:
       name: Link famoso
-      description: Postou um link externo com 1000 clicks
+      description: Postou um link externo com 1.000 cliques
       long_description: |
-        Esse emblema é concedido quando um link compartilhado recebe 1.000 cliques. Uau! Você postou um link que melhorou significativamente a conversa adicionando detalhes, contexto e informações essenciais. Ótimo trabalho!
+        Este emblema é concedido quando um link compartilhado recebe 1.000 cliques. Uau! Você postou um link que melhorou consideravelmente a conversa adicionando detalhes, contexto e informações essenciais. Ótimo trabalho!
     appreciated:
-      name: Agradecido
-      description: Teve 20 mensagens curtidas
+      name: Apreciado
+      description: Recebeu uma curtida em 20 postagens
       long_description: |
-        Esse emblema é concedido quando você recebe ao menos uma curtida em 20 postagens diferentes. A comunidade está gostando das suas contribuições às conversas aqui!
+        Este emblema é concedido quando você recebe ao menos uma curtida em 20 postagens diferentes. A comunidade está gostando das suas contribuições para as conversas!
     respected:
-      name: Respeitado
+      name: Respeitado(a)
       description: Recebeu 2 curtidas em 100 postagens
       long_description: |
-        Esse emblema é concedido quando você recebe ao menos 2 curtidas em 100 posts diferentes. A comunidade está cultivando um respeito por suas várias contribuições e conversas aqui.
+        Este emblema é concedido quando você recebe ao menos duas curtidas em 100 postagens diferentes. A comunidade está desenvolvendo respeito por suas várias contribuições e conversas aqui.
     admired:
-      name: Admirado
-      description: Recebeu 5 curtidas em 300 postagens
+      name: Admirado(a)
+      description: Recebeu cinco curtidas em 300 postagens
       long_description: |
-        Esse emblema é concedido quando você recebe pelo menos 5 curtidas em 300 postagens diferentes. Uau! A comunidade admira suas contribuições freqüentes e de alta qualidade para as conversas aqui.
+        Este emblema é concedido quando você recebe pelo menos cinco curtidas em 300 postagens diferentes. Uau! A comunidade admira suas contribuições frequentes e de alta qualidade para as conversas aqui.
     out_of_love:
-      name: Por Amor
+      name: Por amor
       description: Usou %{max_likes_per_day} curtidas no mesmo dia
       long_description: |
-        Este emblema é concedido quando você usa todas as suas %{max_likes_per_day} curtidas diárias. Lembrar-se de curtir as postagens que você gosta e aprecia incentiva seus colegas membros da comunidade a criar ainda mais discussões de qualidade no futuro.
+        Este emblema é concedido quando você usa todas as suas %{max_likes_per_day} curtidas diárias. Lembre-se de que curtir as suas postagens favoritas incentiva seus colegas da comunidade a criar ainda mais discussões de qualidade no futuro.
     higher_love:
-      name: Amor Maior
-      description: Usou %{max_likes_per_day} curtidas no mesmo dia 5 vezes
+      name: Amor maior
+      description: Usou %{max_likes_per_day} curtidas no mesmo dia cinco vezes
       long_description: |
-        Este emblema é concedido quando você usa todas as suas %{max_likes_per_day} curtidas diárias durante 5 dias. Obrigado por dedicar um tempo para incentivar ativamente as melhores conversas todos os dias!
+        Este emblema é concedido quando você usa todas as suas %{max_likes_per_day} curtidas diárias durante cinco dias. Obrigado por dedicar um tempo para incentivar ativamente as melhores conversas todos os dias!
     crazy_in_love:
-      name: Apaixonado
+      name: Apaixonado(a)
       description: Usou %{max_likes_per_day} curtidas no mesmo dia 20 vezes
       long_description: |
-        Este emblema é concedido quando você usa todas as suas %{max_likes_per_day} curtidas diárias durante 20 dias. Uau! Você é um modelo para incentivar seus colegas membros da comunidade!
+        Este emblema é concedido quando você usa todas as suas %{max_likes_per_day} curtidas diárias durante 20 dias. Uau! Você é um exemplo para incentivar os membros da comunidade!
     thank_you:
       name: Obrigado
-      description: Teve 20 postagens curtidas e curtiu 10 postagens
+      description: Teve 20 postagens curtidas e curtiu dez postagens
       long_description: |
-        Esse emblema é concedido quando você tem 20 postagens curtidas e dá 10 curtidas ou mais em troca. Quando alguém curte suas postagens, você encontra tempo de curtir o que os outros estão postando também.
+        Este emblema é concedido quando você tem 20 postagens curtidas e dá 10 curtidas ou mais em troca. Quando alguém curte suas postagens, você dedica tempo para curtir o que os(as) outros(as) estão postando também.
     gives_back:
-      name: Retribuidor
+      name: Retribuidor(a)
       description: Curtiu 100 postagens e teve 100 postagens curtidas
       long_description: |
-        Esse emblema é concedido quando você tem 100 postagens curtidas e dá 100 curtidas ou mais em troca. Obrigado por passar pra frente!
+        Este emblema é concedido quando você tem 100 postagens curtidas e dá 100 curtidas ou mais em troca. Obrigado por passar para frente!
     empathetic:
-      name: Empático
-      description: Curtiu 1000 mensagens e recebeu 500 curtidas
+      name: Empático(a)
+      description: Curtiu 1.000 mensagens e recebeu 500 curtidas
       long_description: |
-        Esse emblema é concedido quando você tem 500 postagens e recebe 1.000 curtidas ou mais em troca. Uau! Você é um modelo de generosidade e apreciação mútua :two_hearts:.
+        Este emblema é concedido quando você tem 500 postagens e recebe 1.000 curtidas ou mais em troca. Uau! Você é um modelo de generosidade e apreciação mútua :two_hearts:.
     first_emoji:
       name: Primeiro emoji
-      description: Utilizou um emoji em uma publicação
+      description: Utilizou um emoji em uma postagem
       long_description: |
-        Este emblema é concedido na primeira vez que você adicionar um Emoji à sua postagem :thumbsup:. Emojis permitem que você transmita emoção em suas postagens, desde felicidade :smiley: até tristeza :anguished:, raiva :angry: e todo o resto :sunglasses:. Basta digitar um : (dois pontos) ou pressionar o botão de Emoji na barra de ferramentas do editor para selecionar uma das centenas de opções :ok_hand:
+        Este emblema é concedido na primeira vez que você adicionar um Emoji à sua postagem :thumbsup:. Emojis permitem que você transmita emoção em suas postagens, de felicidade :smiley: até tristeza :anguished:, raiva :angry: e todo o resto :sunglasses:. Basta digitar um : (dois pontos) ou pressionar o botão de emoji na barra de ferramentas do editor para selecionar uma das centenas de opções :ok_hand:
     first_mention:
       name: Primeira menção
-      description: Mencionou um usuário em uma postagem
+      description: Mencionou um(a) usuário(a) em uma postagem
       long_description: |
-        Este emblema é concedido na primeira vez em que você menciona o @nome_de_usuário de alguém na sua postagem. Cada menção gera uma notificação para essa pessoa, para que ela saiba sobre sua postagem. Basta começar a digitar @ (arroba) para mencionar qualquer usuário ou, se permitido, um grupo – é uma maneira conveniente de chamar a atenção de outros usuários para algo.
+        Este emblema é concedido na primeira vez em que você menciona o @nome_de_usuário de alguém na sua postagem. Cada menção gera uma notificação para essa pessoa, para que saiba sobre sua postagem. Basta começar a digitar @ (arroba) para mencionar qualquer usuário(a) ou, se permitido, um grupo. É uma maneira conveniente de chamar a atenção de outros(as) usuários(as) para algo.
     first_onebox:
       name: Primeiro Onebox
-      description: Postou um link que foi embutido na mensagem
+      description: Postou um link que foi acrescentado ao Onebox
       long_description: |
-        Esse emblema é concedido na primeira vez em que você publica um link em uma linha sozinho, que é automaticamente expandido para um embed com um resumo, título e (quando disponível) imagem.
+        Este emblema é concedido na primeira vez em que você publica um link em uma linha sozinho, que é automaticamente expandido para um Onebox com um resumo, título e (quando disponível) imagem.
     first_reply_by_email:
-      name: Primeira Resposta por email
+      name: Primeira resposta por e-mail
       description: Respondeu a uma postagem por e-mail
       long_description: |
-        Este emblema é concedido na primeira vez que você responder a uma postagem por email :e-mail:.
+        Este emblema é concedido na primeira vez que você responder a uma postagem por e-mail :e-mail:.
     new_user_of_the_month:
-      name: "Novo usuário do mês"
+      name: "Novo(a) usuário(a) do mês"
       description: Contribuições pendentes no primeiro mês
       long_description: |
-        Este emblema é concedido para parabenizar dois novos usuários a cada mês por suas excelentes contribuições gerais, de acordo com quantas e quais pessoas curtiram suas postagens.
+        Este emblema é concedido para parabenizar dois(duas) novos(as) usuários(as) a cada mês por suas excelentes contribuições gerais, de acordo com quantas e quais pessoas curtiram suas postagens.
     enthusiast:
       name: Entusiasta
-      description: Visitou 10 dias consecutivos
+      description: Acessou durante dez dias consecutivos
       long_description: |
-        Este emblema é concedido ao visitar durante 10 dias consecutivos. Obrigado por ficar com a gente por mais de uma semana!
+        Este emblema é concedido ao acessar durante dez dias consecutivos. Obrigado por ficar com a gente por mais de uma semana!
     aficionado:
-      name: Aficionado
-      description: Visitou 100 dias consecutivos
+      name: Aficionado(a)
+      description: Acessou durante 100 dias consecutivos
       long_description: |
-        Este distintivo é concedido para visitas de 100 dias consecutivos. Isso é mais do que três meses!
+        Este distintivo é concedido por acessar durante 100 dias consecutivos. Isso é mais do que três meses!
     devotee:
-      name: Devoto
-      description: Visitou 365 dias consecutivos
+      name: Devoto(a)
+      description: Acessou 365 dias consecutivos
       long_description: |
-        Este emblema é concedido por ter visitado 365 dias consecutivos. Uau, um ano inteiro!
+        Este emblema é concedido por ter acessado 365 dias consecutivos. Uau, um ano inteiro!
     badge_title_metadata: "%{display_name} emblema em %{site_title}"
   admin_login:
-    success: "Email Enviado"
+    success: "E-mail enviado"
     errors:
       unknown_email_address: "endereço de e-mail desconhecido."
-      invalid_token: "token inválido"
-    email_input: "Email do Administrador"
-    submit_button: "Enviar Email"
+      invalid_token: "token inválido."
+    email_input: "E-mail do(a) administrador(a)"
+    submit_button: "Enviar e-mail"
   performance_report:
-    initial_post_raw: Este tópico inclui relatórios de performance diários de seu site.
-    initial_topic_title: Relatórios de performance do Site
+    initial_post_raw: Este tópico inclui relatórios de desempenho diários do seu site.
+    initial_topic_title: Relatórios de desempenho do site
   tags:
-    title: "Marcações"
+    title: "Etiquetas"
     restricted_tag_disallowed: 'Você não pode aplicar a etiqueta "%{tag}".'
     restricted_tag_remove_disallowed: 'Você não pode remover a etiqueta "%{tag}".'
     minimum_required_tags:
@@ -3378,70 +4240,74 @@ pt_BR:
     upload_row_too_long: "O arquivo CSV deve ter uma etiqueta por linha. Opcionalmente, a etiqueta pode ser seguida por uma vírgula e, em seguida, pelo nome do grupo de etiquetas."
     forbidden:
       invalid:
-        one: "A tag que você selecionou não pode ser usada"
-        other: "Nenhuma das tags que você selecionou pode ser usada"
+        one: "A etiqueta que você selecionou não pode ser usada"
+        other: "Nenhuma das etiquetas que você selecionou pode ser usada"
       in_this_category: '"%{tag_name}" não pode ser usado nesta categoria'
       restricted_to:
         one: '"%{tag_name}" é restrito à categoria "%{category_names}"'
         other: '"%{tag_name}" é restrito às seguintes categorias: %{category_names}'
-      synonym: 'Sinônimos não são permitidos. Use "%{tag_name}" em seu lugar.'
-      has_synonyms: '"%{tag_name}"  não pode ser usado porque possui sinônimos.'
+      synonym: 'Sinônimos não são permitidos. Use "%{tag_name}".'
+      has_synonyms: '"%{tag_name}" não pode ser usado porque tem sinônimos.'
+    required_tags_from_group:
+      one: "Você deve incluir pelo menos %{count} etiqueta %{tag_group_name}. As etiquetas deste grupo são: %{tags}."
+      other: "Você deve incluir pelo menos %{count} etiquetas %{tag_group_name}. As etiquetas deste grupo são: %{tags}."
     invalid_target_tag: "não pode ser um sinônimo de um sinônimo"
-    synonyms_exist: "não é permitido pois existem sinônimos"
-  rss_by_tag: "Tópicos marcados com %{tag}"
+    synonyms_exist: "não é permitido, pois existem sinônimos"
+  rss_by_tag: "Tópicos etiquetados com %{tag}"
   finish_installation:
     congratulations: "Parabéns, você instalou o Discourse!"
     register:
-      button: "Registro"
-      title: "Registro da Conta Administradora"
-      help: "registro de uma nova conta para ser iniciado"
-      no_emails: "Infelizmente, nenhum e-mail de administrador foi definido durante a configuração, portanto, a finalização da configuração pode ser difícil. Por favor, adicione o e-mail no arquivo de configuração ou <a href='https://meta.discourse.org/t/create-admin-account-from-console/17274'>criar uma conta de administrador a partir do console</a>."
+      button: "Cadastrar"
+      title: "Cadastrar conta de administrador(a)"
+      help: "Início do registro de uma nova conta"
+      no_emails: "Infelizmente, nenhum e-mail de administrador(a) foi definido durante a configuração, portanto a finalização da configuração pode ser difícil. Adicione o e-mail ao arquivo de configuração ou <a href='https://meta.discourse.org/t/create-admin-account-from-console/17274'>crie uma conta de administrador(a) a partir do console</a>."
     confirm_email:
-      title: "Confirme seu email"
-      message: "<p>Enviamos um e-mail de ativação para <b>%{email}</b>. Por favor, siga as instruções no e-mail para ativar sua conta.</p><p>Se não chegar, verifique sua pasta de spam e <a href='https://meta.discourse.org/t/troubleshooting-email-on-a-new-discourse-install/16326'>certifique-se de que você configurou o e-mail corretamente</a>.</p>"
+      title: "Confirme seu e-mail"
+      message: "<p>Enviamos um e-mail de ativação para <b>%{email}</b>. Por favor, siga as instruções no e-mail para ativar sua conta.</p><p>Se não chegar, verifique sua pasta de spam e <a href='https://meta.discourse.org/t/troubleshooting-email-on-a-new-discourse-install/16326'>se o e-mail foi configurado corretamente</a>.</p>"
     resend_email:
-      title: "Reenviar Email de Confirmação"
-      message: "<p>Reenviamos o email de confirmação para <b>%{email}</b>"
+      title: "Reenviar e-mail de confirmação"
+      message: "<p>Reenviamos o e-mail de confirmação para <b>%{email}</b>"
   safe_mode:
-    title: "Entre no modo de segurança"
-    description: "O modo de segurança permite que você teste seu site sem carregar plug-ins ou personalizações de site."
-    no_customizations: "Desabilitar tema atual"
-    only_official: "Desabilitar plugins não oficiais"
-    no_plugins: "Desabilitar todos os plugins"
-    enter: "Entre no modo de segurança"
+    title: "Entrar no modo de segurança"
+    description: "O modo de segurança permite que você teste seu site sem carregar plug-ins ou personalizações."
+    no_customizations: "Desativar tema atual"
+    only_official: "Desativar plug-ins não oficiais"
+    no_plugins: "Desativar todos os plug-ins"
+    enter: "Entrar no modo de segurança"
     must_select: "Você deve selecionar pelo menos uma opção para entrar no modo de segurança."
   wizard:
     title: "Configuração do Discourse"
     step:
       locale:
-        title: "Bem-vindo ao seu Discourse!"
+        title: "Boas-vindas ao seu Discourse!"
         fields:
           default_locale:
             description: "Qual é o idioma padrão para sua comunidade?"
       forum_title:
         title: "Nome"
-        description: "Seu nome é um sinal visível à distância, a <i>primeira</i> coisa que os potenciais visitantes notarão sobre a sua comunidade. O que seu nome e título dizem sobre sua comunidade?"
+        description: "Seu nome é o seu cartão de visita, a <i>primeira</i> coisa que os possíveis visitantes notarão na sua comunidade. O que seu nome e título dizem sobre ela?"
         fields:
           title:
-            label: "O nome de sua comunidade"
+            label: "Nome de sua comunidade"
             placeholder: "Hangout de Jane"
           site_description:
-            label: "Descreva sua comunidade numa frase curta."
+            label: "Descreva sua comunidade com uma frase curta."
             placeholder: "Um lugar para Jane e seus amigos discutirem coisas legais."
           short_site_description:
             label: "Descreva sua comunidade em poucas palavras"
             placeholder: "Melhor comunidade de todos os tempos"
       introduction:
         title: "Introdução"
-        disabled: "<p>Não encontramos nenhum tópico com o título “%{topic_title}”.</p> <ul> <li>Se você alterou o título, edite aquele tópico para modificar o texto introdutório do seu site.</li> <li>Se você tiver excluído este tópico, crie outro tópico com “%{topic_title}” como título. O conteúdo da primeira postagem é o texto introdutório do seu site.</li> </ul>"
+        disabled: "<p>Não encontramos nenhum tópico com o título de “%{topic_title}”.</p> <ul> <li>Se você tiver alterado o título, edite o tópico para modificar o texto introdutório do seu site.</li> <li>Se tiver excluído o tópico, crie outro com o título de “%{topic_title}”. O conteúdo da primeira postagem é o texto introdutório do seu site.</li> </ul>"
         fields:
           welcome:
             label: "Tópico de boas-vindas"
-            description: "<p>Como você descreveria sua comunidade para um estranho em um elevador em cerca de 1 minuto?</p> <ul> <li>Para quem são essas discussões?</li> <li>O que posso encontrar aqui?</li> <li>Por que eu deveria visitar?</li> </ul> <p>Seu tópico de boas vindas é a primeira coisa que os recém-chegados vão ler. Pense nele como um \"argumento de elevador\" ou \"declaração de missão\" de <b>um parágrafo</b>.</p>"
+            description: "<p>Como você descreveria sua comunidade para um(a) estranho(a) em um elevador durante cerca de 1 minuto?</p> <ul> <li>Para quem são essas discussões?</li> <li>O que posso encontrar aqui?</li> <li>Por que eu deveria acessar?</li> </ul> <p>Seu tópico de boas-vindas é a primeira coisa que os(as) recém-chegados(as) vão ler. Pense nele como um \"argumento de elevador\" ou \"declaração de missão\" de <b>um parágrafo</b>.</p>"
             one_paragraph: "Reduza sua mensagem de boas-vindas para um parágrafo."
+            extra_description: "Se não tiver certeza, pule este passo e edite seu tópico de boas-vindas mais tarde."
       privacy:
         title: "Acesso"
-        description: "<p>A sua comunidade é aberta a todos ou é restrita por associação, convite ou aprovação? Se preferir, você pode configurar as coisas de forma privada e depois mudar para o público mais tarde.</p>"
+        description: "<p>A sua comunidade é aberta a todos ou é restrita por associação, convite ou aprovação? Se preferir, você pode configurar as coisas de forma privada e depois torná-la pública mais tarde.</p>"
         fields:
           privacy:
             choices:
@@ -3450,16 +4316,16 @@ pt_BR:
                 description: "Qualquer um(a) pode acessar esta comunidade"
               restricted:
                 label: "Privado(a)"
-                description: "Somente usuários logados podem acessar esta comunidade"
+                description: "Somente usuários(as) que entraram com a conta podem acessar esta comunidade"
           privacy_options:
-            description: "Como novos usuários se cadastram para uma conta?"
+            description: "Como novos(as) usuários(as) criam uma conta?"
             choices:
               open:
-                label: "Usuários podem se cadastrar por conta própria."
+                label: "Os usuários(as) podem criar uma conta por conta própria."
               invite_only:
-                label: "Usuários precisam ser convidados por usuários confiáveis ou pela staff antes de poderem se cadastrar."
+                label: "Usuários(as) precisam ser convidados(as) por usuários(as) confiáveis ou pela equipe antes de poderem criar a conta."
               must_approve:
-                label: "Usuários podem se cadastrar por conta própria, mas devem ser aprovados pela staff."
+                label: "Usuários(as) podem criar sua conta por conta própria, mas devem ser aprovados pela equipe."
       contact:
         title: "Contato"
         fields:
@@ -3470,13 +4336,13 @@ pt_BR:
           contact_url:
             label: "Página da web"
             placeholder: "https://www.example.com/contact-us"
-            description: "Página de contato geral para você ou sua organização. Será exibido no <a href='%{base_path}/about' target='_blank'>sua sobre a página</a>."
+            description: "Página de contato geral para você ou sua organização. Será exibida no <a href='%{base_path}/about' target='_blank'>sua página Sobre</a>."
           site_contact:
             label: "Mensagens automáticas"
             description: "Todas as mensagens pessoais automáticas do Discourse serão enviadas a partir deste(a) usuário(a), como avisos de sinalizadores e de conclusão de cópia de segurança."
       corporate:
         title: "Organização"
-        description: "Estas informações serão inseridas nos seus <a href='%{base_path}/tos' target='blank'>Termos de Serviço</a>, que é um tópico que você pode editar na categoria da staff. Se você não tem uma empresa, sinta-se à vontade para pular esta etapa por enquanto."
+        description: "Estas informações serão inseridas nos seus <a href='%{base_path}/tos' target='blank'>Termos de Serviço</a>, que é um tópico que você pode editar na categoria da equipe. Se você não tem uma empresa, sinta-se à vontade para pular esta etapa por enquanto."
         fields:
           company_name:
             label: "Nome da empresa"
@@ -3490,7 +4356,12 @@ pt_BR:
       colors:
         title: "Cores"
       fonts:
+        title: "Fontes"
         fields:
+          body_font:
+            label: "Fonte do corpo"
+          heading_font:
+            label: "Fonte do cabeçalho"
           font_preview:
             label: "Pré-visualização"
       logos:
@@ -3498,21 +4369,21 @@ pt_BR:
         fields:
           logo:
             label: "Logotipo primário"
-            description: "A imagem do logotipo no canto superior esquerdo do seu site. Use uma imagem retangular larga com uma altura de 120 e uma proporção maior que 3:1"
+            description: "A imagem do logotipo no canto superior à esquerda do seu site. Use uma imagem retangular larga com 120 de altura e uma proporção maior que 3:1"
           logo_small:
             label: "Logotipo quadrado"
-            description: "Uma versão quadrada do seu logotipo. Mostrado no canto superior esquerdo do seu site ao rolar para baixo, no navegador e ao compartilhar em plataformas sociais. Idealmente maior que 512x512."
+            description: "Uma versão quadrada do seu logotipo. Exibido no canto superior à esquerda do seu site ao rolar para baixo, no navegador, e ao compartilhar em plataformas de redes sociais. Idealmente maior que 512x512."
       icons:
         title: "Ícones"
         fields:
           favicon:
             label: "Ícone do navegador"
-            description: "Imagem de ícone usada para representar seu site em navegadores da Web com boa aparência em tamanhos pequenos. As extensões de imagem recomendadas são PNG ou JPG. Vamos usar o logotipo quadrado por padrão."
+            description: "Imagem de ícone usada para representar seu site em navegadores com boa aparência em tamanhos pequenos. As extensões de imagem recomendadas são PNG ou JPG. Vamos usar o logotipo quadrado por padrão."
           large_icon:
             label: "Ícone grande"
-            description: "Imagem de ícone usada para representar seu site em dispositivos modernos com boa aparência em tamanhos maiores. Idealmente maior que 512 × 512. Usaremos o logotipo quadrado por padrão."
+            description: "Imagem do ícone usada para representar seu site em dispositivos modernos com boa aparência em tamanhos maiores. Idealmente maior que 512×512. Usaremos o logotipo quadrado por padrão."
       homepage:
-        description: "Recomendamos que você mostre os tópicos mais recentes em sua página inicial, mas também pode mostrar categorias (grupos de tópicos) na página inicial, se preferir."
+        description: "Recomendamos mostrar os tópicos mais recentes na sua página inicial, mas você também pode mostrar categorias (grupos de tópicos) na página inicial, se preferir."
         title: "Página Inicial"
         fields:
           homepage_style:
@@ -3530,105 +4401,119 @@ pt_BR:
               categories_boxes:
                 label: "Caixas de categorias"
               categories_boxes_with_topics:
-                label: "Caixas de categorias com Tópicos"
+                label: "Caixas de categorias com tópicos"
       invites:
-        title: "Convidar um grupo"
-        description: "Você está quase pronto! Vamos convidar algumas pessoas para ajudar <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>\nsemear suas discussões</a> com tópicos e respostas interessantes para iniciar sua comunidade."
-        disabled: "Como os logins locais estão desabilitados, não é possível enviar convites para ninguém. Por favor, prossiga para o próximo passo."
+        title: "Convidar equipe"
+        description: "Você está quase pronto(as)! Vamos convidar algumas pessoas para ajudar a <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>\ndivulgar as suas discussões</a> com tópicos e respostas interessantes para iniciar sua comunidade."
+        disabled: "Como as entradas com conta foram desativadas, não é possível enviar convites para ninguém. Prossiga para o próximo passo."
       finished:
         title: "Seu Discourse está pronto!"
+        description: |
+          <p>Se quiser alterar esta configurações, <b>execute este instalador quando quiser</b>, ou acesse <a href='%{base_path}/admin' target='_blank'>sua seção de administrador(a)</a>, perto do ícone de chave inglesa no menu do site.</p>
+          <p>É fácil personalizar o seu Discourse ainda mais usando este sistema de temática poderoso. Por exemplo: confira os <a href="https://meta.discourse.org/c/theme/61/l/top" target="_blank">melhores temas e componentes</a> em <a href="https://meta.discourse.org/" target="_blank">meta.discourse.org</a>.</p>
+          <p>Divirta-se e boa sorte <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>construindo a sua nova comunidade!</a></p>
   search_logs:
     graph_title: "Contagem de pesquisa"
   joined: "Ingressou"
   discourse_push_notifications:
     popup:
-      mentioned: '%{username} mencionou você em "%{topic}" - %{site_title}'
-      group_mentioned: '%{username} mencionou você em "%{topic}" - %{site_title}'
-      quoted: '%{username} citou você em "%{topic}" - %{site_title}'
-      replied: '%{username} respondeu-lhe em "%{topic}" - %{site_title}'
+      mentioned: 'Você foi mencionado(a) por %{username} em "%{topic}" - %{site_title}'
+      group_mentioned: 'Você foi mencionado(a) %{username} em "%{topic}" - %{site_title}'
+      quoted: 'Você foi citado(a) por %{username} em "%{topic}" - %{site_title}'
+      replied: '%{username} respondeu em "%{topic}" - %{site_title}'
       posted: '%{username} postou em "%{topic}" - %{site_title}'
-      private_message: '%{username} enviou-lhe uma mensagem privada em "%{topic}" - %{site_title}'
-      linked: '%{username} linkou para a sua postagem de "%{topic}" - %{site_title}'
+      private_message: '%{username} enviou uma mensagem privada em "%{topic}" - %{site_title}'
+      linked: '%{username} vinculou sua postagem em "%{topic}" - %{site_title}'
       watching_first_post: '%{username} criou um novo tópico "%{topic}" - %{site_title}'
       confirm_title: "Notificações ativadas - %{site_title}"
-      confirm_body: "Sucesso! Notificações foram ativadas."
+      confirm_body: "Tudo pronto! As notificações foram ativadas."
       custom: "Notificação de %{username} em %{site_title}"
   staff_action_logs:
-    not_found: "não encontrado"
-    unknown: "desconhecido"
-    user_merged: "%{username} foi mesclado nessa conta"
-    user_delete_self: "Excluído por si mesmo de %{url}"
-    webhook_deactivation_reason: "Seu webhook foi desativado automaticamente. Recebemos várias respostas de falha de status HTTP '%{status}'."
+    not_found: "não encontrado(a)"
+    unknown: "desconhecido(a)"
+    user_merged: "%{username} foi mesclado(a) nesta conta"
+    user_delete_self: "Autoexcluído(a) de %{url}"
+    webhook_deactivation_reason: "Seu webhook foi desativado automaticamente. Recebemos várias respostas de falha de status HTTP \"%{status}\"."
     api_key:
-      revoked: Regovado
+      automatic_revoked:
+        one: "Revogado(a) automaticamente, última atividade há mais de %{count} dia"
+        other: "Revogado(a) automaticamente, última atividade há mais de %{count} dias"
+      revoked: Regovado(a)
+      restored: Restaurado(a)
   reviewables:
     already_handled: "Obrigado, mas já analisamos esta postagem e determinamos que não precisa ser sinalizada novamente."
+    already_handled_and_user_not_exist: "Obrigado, mas alguém já revisou e esse(a) usuário(a) não existe mais."
     priorities:
-      low: "Baixo"
-      medium: "Média"
-      high: "Alta"
+      low: "Baixo(a)"
+      medium: "Médio(a)"
+      high: "Alto(a)"
     sensitivity:
-      disabled: "Desativado"
-      low: "Baixo"
-      medium: "Média"
-      high: "Alta"
-    must_claim: "Você precisa reivindicar itens antes de agir sobre eles."
-    user_claimed: "Este item foi reivindicado por outro usuário."
-    missing_version: "Você precisa fornecer um parâmetro de versão"
-    conflict: "Houve um conflito de atualização impedindo você de fazer isso."
+      disabled: "Desativado(a)"
+      low: "Baixo(a)"
+      medium: "Médio(a)"
+      high: "Alto(a)"
+    must_claim: "Você precisa reivindicar itens antes de agir."
+    user_claimed: "Este item foi reivindicado por outro(a) usuário(a)."
+    missing_version: "Você precisa informar um parâmetro de versão"
+    conflict: "Houve um conflito de atualização impedindo de fazer isso."
     reasons:
-      post_count: "As primeiras postagens de todos os usuários devem ser aprovadas pela staff. Veja `approve_post_count`."
-      trust_level: "Usuários com níveis de confiança baixos precisam ter respostas aprovadas pela staff. Veja `approve_unless_trust_level`."
-      new_topics_unless_trust_level: "Usuários com níveis de confiança baixos precisam ter tópicos aprovados pela staff. Veja `approve_new_topics_unless_trust_level`."
-      fast_typer: "Novo usuário digitou sua primeira postagem desconfiadamente rápido, suspeita de comportamento de bot ou spammer. Veja `min_first_post_typing_time`."
-      auto_silence_regexp: "Novo usuário cuja primeira postagem corresponde à configuração `auto_silence_first_post_regex`."
+      post_count: "As primeiras postagens de todos os(as) usuários(as) devem ser aprovadas pela equipe. Acesse \"approve_post_count\"."
+      trust_level: "Usuários(as) com níveis de confiança baixos precisam ter respostas aprovadas pela equipe. Veja \"approve_unless_trust_level\"."
+      new_topics_unless_trust_level: "Usuários(as) com níveis de confiança baixos precisam ter tópicos aprovados pela equipe. Veja \"approve_unless_trust_level\"."
+      fast_typer: "O(a) novo(a) usuário(a) digitou sua primeira postagem desconfiadamente rápido, há suspeita de comportamento de robô ou remetente de spam. Veja \"min_first_post_typing_time\"."
+      auto_silence_regexp: "Novo(a) usuário(a) cuja primeira postagem corresponde à configuração \"auto_silence_first_post_regex\"."
+      watched_word: "Esta postagem incluiu uma palavra acompanhada. Confira sua <a href='%{base_url}/admin/logs/watched_words'>lista de palavras acompanhadas</a>."
       staged: "Novos tópicos e postagens para usuários encenados(as) precisam ser aprovados pela equipe. Veja \"approve_unless_staged\"."
-      category: "Postagens nesta categoria exigem aprovação manual pela staff. Veja as configurações da categoria."
-      must_approve_users: "Todos os novos usuários precisam ser aprovados pela staff. Veja `must_approve_users`."
-      invite_only: "Todos os novos usuários devem ser convidados. Veja `invite_only`."
+      category: "Postagens nesta categoria exigem aprovação manual pela equipe. Veja as configurações da categoria."
+      must_approve_users: "Todos os novos(as) usuários(as) precisam ser aprovados(as) pela equipe. Veja \"must_approve_users\"."
+      invite_only: "Todos os(as) novos(as) usuários(as) devem ser convidados(as). Veja \"invite_only\"."
+      email_auth_res_enqueue: "Este e-mail falhou na verificação DMARC, é altamente provável que o remetente não é quem parece ser. Confira os cabeçalhos de e-mail não processados para obter mais informações."
       email_spam: "Este e-mail foi sinalizado como spam pelo cabeçalho definido em \"email_in_spam_header\"."
+      suspect_user: "Este(a) novo(a) usuário(a) inseriu informações de perfil sem ler nenhum tópico ou postagem, o que sugere que possa ser remetente de spam. Consulte \"approve_suspect_users\"."
+      contains_media: "Esta postagem inclui mídias incorporadas. Confira \"review_media_unless_trust_level\"."
+      queued_by_staff: "Um membro da equipe acha que esta postagem precisa de revisão. Permanecerá oculta até que isso seja feito."
     actions:
       agree:
         title: "Concordar…"
       agree_and_keep:
-        title: "Manter Post"
+        title: "Manter postagem"
         description: "Concorde com o sinalizador e mantenha a postagem inalterada."
       agree_and_keep_hidden:
-        title: "Manter Postagem Escondida"
+        title: "Manter postagem oculta"
         description: "Concorde com o sinalizador e mantenha a postagem oculta."
       agree_and_suspend:
-        title: "Suspender usuário"
+        title: "Suspender usuário(a)"
         description: "Concorde com o sinalizador e suspenda o(a) usuário(a)."
       agree_and_silence:
-        title: "Silenciar Usuário"
+        title: "Silenciar usuário(a)"
         description: "Concorde com o sinalizador e silencie o(a) usuário(a)."
       agree_and_restore:
-        title: "Restaurar Postagem"
-        description: "Restaure a postagem para que todos os usuários possam vê-la."
+        title: "Restaurar postagem"
+        description: "Restaure a postagem para que todos os(as) usuários(as) possam ver."
       agree_and_hide:
-        title: "Esconder publicação"
-        description: "Esconder esta publicação e enviar automaticamente ao usuário uma mensagem pedindo-lhe para editá-lo."
+        title: "Ocultar publicação"
+        description: "Oculte esta publicação e envie automaticamente ao(à) usuário(as) uma mensagem pedindo que edite."
       delete_single:
         title: "Excluir"
       delete:
         title: "Excluir…"
       delete_and_ignore:
-        title: "Excluir Postagem e Ignorar"
-        description: "Excluir postagem; se for a primeira postagem, excluir o tópico também"
+        title: "Excluir postagem e ignorar"
+        description: "Excluir postagem. Se for a primeira postagem, excluir o tópico também"
       delete_and_ignore_replies:
-        title: "Excluir Postagem + Respostas e Ignorar"
-        description: "Excluir postagem e todas as suas respostas; se for a primeira postagem, excluir o tópico também"
+        title: "Excluir postagem + respostas e ignorar"
+        description: "Excluir postagem e todas as suas respostas. Se for a primeira postagem, excluir o tópico também"
         confirm: "Você tem certeza de que deseja excluir as respostas desta postagem também?"
       delete_and_agree:
-        title: "Excluir Postagem e Concordar"
-        description: "Excluir postagem; se for a primeira postagem, excluir o tópico também"
+        title: "Excluir postagem e concordar"
+        description: "Excluir postagem. Se for a primeira postagem, excluir o tópico também"
       delete_and_agree_replies:
-        title: "Excluir Postagem + Respostas e Concordar"
-        description: "Excluir postagem e todas as suas respostas; se for a primeira postagem, excluir o tópico também"
+        title: "Excluir postagem + respostas e concordar"
+        description: "Excluir postagem e todas as suas respostas. Se for a primeira postagem, excluir o tópico também"
         confirm: "Você tem certeza de que deseja excluir as respostas desta postagem também?"
       disagree_and_restore:
-        title: "Discordar e Restaurar Postagem"
-        description: "Restaure a postagem para que todos os usuários possam vê-la."
+        title: "Discordar e restaurar postagem"
+        description: "Restaure a postagem para que todos os(as) usuários(as) possam ver."
       disagree:
         title: "Discordar"
       ignore:
@@ -3636,28 +4521,58 @@ pt_BR:
       approve:
         title: "Aprovar"
       approve_post:
-        title: "Aprovar Postagem"
+        title: "Aprovar postagem"
         confirm_closed: "Este tópico está fechado. Gostaria de criar a postagem mesmo assim?"
       reject_post:
-        title: "Rejeitar Postagem"
+        title: "Rejeitar postagem"
       approve_user:
-        title: "Aprovar Usuário"
+        title: "Aprovar usuário(a)"
       reject_user:
-        title: "Excluir Usuário…"
+        title: "Excluir usuário(a)…"
         delete:
-          title: "Excluir Usuário"
-          description: "O usuário será excluído do fórum."
+          title: "Excluir usuário(a)"
+          description: "O(a) usuário(a) será excluído(a) do fórum."
         block:
-          title: "Excluir e Bloquear Usuário"
-          description: "O usuário será excluído e bloquearemos seu endereço IP e de e-mail."
+          title: "Excluir e bloquear usuário(a)"
+          description: "O(a) usuário(a) será excluído(a) e bloquearemos seu endereço IP e de e-mail."
       reject:
         title: "Rejeitar"
+        bundle_title: "Rejeitar..."
+      reject_and_suspend:
+        title: "Rejeitar e suspender usuário(a)"
+      reject_and_silence:
+        title: "Rejeitar e silenciar usuário(a)"
+      reject_and_delete:
+        title: "Rejeitar e excluir a postagem"
+      reject_and_keep_deleted:
+        title: "Manter a postagem excluída"
+      approve_and_restore:
+        title: "Aprovar e restaurar postagem"
       delete_user:
-        reason: "Excluído via fila de revisão"
+        reason: "Excluído(a) via fila de revisão"
   email_style:
     html_missing_placeholder: "O modelo HTML deve incluir %{placeholder}"
+  notification_level:
+    ignore_error: "Desculpe, não é possível ignorar esse(a) usuário(a)."
+    mute_error: "Desculpe, não é possível silenciar esse(a) usuário(a)."
   discord:
-    not_in_allowed_guild: "Falha na autenticação. Você não é um membro de uma guilda Discord com permissões."
+    not_in_allowed_guild: "Falha na autenticação. Você não é um membro de uma organização permitida do Discord."
+  old_keys_reminder:
+    title: "Lembrar credenciais antigas"
+    body: |
+      Olá! Esta é um lembrete de segurança anual rotineiro da sua instância do Discourse.
+
+      Como cortesia, gostaríamos de avisar que as seguintes credenciais usadas na sua instância do Discourse não foram atualizadas há mais de dois anos:
+
+      %{keys}
+
+      Nenhuma ação é necessária por enquanto. Contudo, renovar as credenciais todos os anos é considerada uma boa prática de segurança.
+  create_linked_topic:
+    topic_title_with_sequence:
+      one: "%{topic_title} (parte %{count})"
+      other: "%{topic_title} (parte %{count})"
+    post_raw: "Continuando a discussContinuing the discussion from %{parent_url}.\n\nPrevious discussions:\n\n%{previous_topics}"
+    small_action_post_raw: "Continue a discussão em %{new_title}."
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index 42b8531093..e610819276 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -1169,7 +1169,6 @@ ro:
     unknown_error: "Există o problema legată de contul tău. Te rugăm contactează administratorul site-ului."
     timeout_expired: "Autentificarea în cont a expirat, te rugăm să încerci din să te autentifici din nou."
   original_poster: "Creatorul unui subiect"
-  most_posts: "Cele mai multe postări"
   most_recent_poster: "Cel mai recent autor"
   frequent_poster: "Autor prodigios"
   redirected_to_top_reasons:
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index 64052af0eb..9a40f1eb34 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -1624,6 +1624,7 @@ ru:
     gtm_container_id: "Идентификатор менеджера тегов Google, например: GTM-ABCDEF. <br/> Примечание: Сторонние скрипты, загруженные менеджером тегов, могут быть внесены в белый список в при помощи директивы `script-src` политики защиты контента (CSP)."
     enable_escaped_fragments: "Обратитесь к Google Ajax-Crawling API, если веб-сканер не обнаружен. См. <a href='https://developers.google.com/webmasters/ajax-crawling/docs/learn-more' target='_blank'>Https://developers.google.com/webmasters/ajax-crawling/docs/learn-more</a>"
     moderators_manage_categories_and_groups: "Разрешать модераторам управлять разделами и группами"
+    moderators_change_post_ownership: "Разрешать модераторам менять владельца сообщения"
     cors_origins: "Разрешённые источники для кросс-доменных запросов (CORS). Каждый источник должен содержать http:// или https://. Для включения CORS переменная окружения DISCOURSE_ENABLE_CORS должна быть установлена в значение 'true'."
     use_admin_ip_allowlist: "Администраторы могут войти в систему только в том случае, если их IP-адрес указан в белом списке (Админка > Логи > IP-адреса)."
     blocked_ip_blocks: "Список локальных диапазонов IP-адресов, которые никогда не должны сканироваться Discourse"
@@ -1699,11 +1700,11 @@ ru:
     auth_overrides_email: "Перезаписывать локальную электронную почту электронной почтой внешнего сайта при каждом входе в систему и запретить её редактирование. Относится ко всем провайдерам аутентификации. (ВНИМАНИЕ: из-за этого могут возникать расхождения)"
     auth_overrides_username: "Перезаписывать локальное имя пользователя пользователем внешнего сайта при каждом входе в систему и запретить его редактирование. Относится ко всем провайдерам аутентификации. (ВНИМАНИЕ: из-за этого могут возникать расхождения)"
     auth_overrides_name: "Перезаписывать локальное полное имя пользователя полным именем пользователем внешнего сайта при каждом входе в систему и запретить его редактирование. Относится ко всем провайдерам аутентификации."
-    discourse_connect_overrides_avatar: "Перезаписывать локальный аватар аватаром, используемым в DiscourseConnect и запретить его изменение"
-    discourse_connect_overrides_location: "Перезаписывать указанное местонахождение пользователя данными с внешнего сайта и запретить их изменение при использовании DiscourseConnect"
-    discourse_connect_overrides_website: "Перезаписывать веб-сайт пользователя данными с внешнего сайта и запретить их изменение при использовании DiscourseConnect"
-    discourse_connect_overrides_profile_background: "Перезаписывать фон шапки профиля аватаром, используемым в DiscourseConnect"
-    discourse_connect_overrides_card_background: "Перезаписывать фон карточки пользователя аватаром, используемым в DiscourseConnect"
+    discourse_connect_overrides_avatar: "Перезаписывать локальный аватар значением, используемым в DiscourseConnect. Если этот параметр включен, пользователям не будет разрешено загружать аватары на Discourse."
+    discourse_connect_overrides_location: "Перезаписывать расположение пользователя данными с DiscourseConnect и запретить их изменение."
+    discourse_connect_overrides_website: "Перезаписывать веб-сайт пользователя данными с DiscourseConnect и запретить их изменение."
+    discourse_connect_overrides_profile_background: "Перезаписывать фон шапки профиля значением, используемым в DiscourseConnect."
+    discourse_connect_overrides_card_background: "Перезаписывать фон карточки пользователя значением, используемым в DiscourseConnect."
     discourse_connect_not_approved_url: "Перенаправлять неподтверждённые DiscourseConnect-аккаунты на этот URL"
     discourse_connect_allows_all_return_paths: "Не вводить ограничения для параметра return_paths на доменное имя, предоставляемое DiscourseConnect (по умолчанию возврат должен осуществляться на текущий сайт)"
     enable_local_logins: "Включить локальные учётные записи на основе имени пользователя и пароля. ВНИМАНИЕ: если параметр отключён, вы не сможете войти в систему, если ранее не был настроен хотя бы один альтернативный метод входа."
@@ -1801,7 +1802,7 @@ ru:
     allow_staff_to_upload_any_file_in_pm: "Разрешать сотрудникам загружать любые файлы в личных сообщениях."
     strip_image_metadata: "Удалять метаданные из изображения."
     composer_media_optimization_image_enabled: "Включить оптимизацию загружаемых файлов изображений на стороне клиента."
-    composer_media_optimization_image_kilobytes_optimization_threshold: "Минимальный размер файла изображения для запуска оптимизации на стороне клиента"
+    composer_media_optimization_image_bytes_optimization_threshold: "Минимальный размер файла изображения для запуска оптимизации на стороне клиента"
     composer_media_optimization_image_resize_dimensions_threshold: "Минимальная ширина изображения для изменения размера изображения на стороне клиента"
     composer_media_optimization_image_resize_width_target: "Для изображений с шириной больше, чем указано в параметре `composer_media_optimization_image_dimensions_resize_threshold`, ширина будет изменена до указанного здесь значения. Значение должно быть больше или равно параметру `composer_media_optimization_image_dimensions_resize_threshold`."
     composer_media_optimization_image_encode_quality: "Качество JPEG-кодирования, используемое в процессе оптимизации."
@@ -2186,6 +2187,7 @@ ru:
     share_quote_buttons: "Определите, какие элементы должны отображаться в окне 'Поделиться' и в какой последовательности."
     share_quote_visibility: "Определите, когда показывать кнопки обмена цитатами: никогда, только анонимным пользователям или всем пользователям. "
     create_revision_on_bulk_topic_moves: "Добавлять первые сообщения в историю редактирования при массовом перемещении тем в другой раздел."
+    allow_changing_staged_user_tracking: "Разрешить пользователю с правами администратора изменять настройки уведомлений для сымитированных пользователей в разделах и тегах."
     errors:
       invalid_email: "Неправильный адрес электронной почты."
       invalid_username: "Пользователя с таким псевдонимом не обнаружено."
@@ -2257,7 +2259,6 @@ ru:
     missing_secret: "Сбой аутентификации из-за отсутствия ключа. Обратитесь к администраторам сайта для решения этой проблемы."
     invite_redeem_failed: "Не удалось осуществить приглашение по ссылке. Пожалуйста, свяжитесь с администратором сайта."
   original_poster: "Автор"
-  most_posts: "Большинство сообщений"
   most_recent_poster: "Последний автор"
   frequent_poster: "Частый автор"
   poster_description_joiner: ", "
@@ -2662,7 +2663,7 @@ ru:
 
       - Обновитесь, используя наш способ онлайн-обновления** [в один клик](%{base_url}/admin/upgrade)**
 
-      - Посмотрите, что появилось нового в последней версии: либо на [нашем сайте](https://meta.discourse.org/tag/release-notes), либо на сайте [GitHub](https://github.com/discourse/discourse/commits/master)
+      - Посмотрите, что появилось нового в последней версии: либо на [нашем сайте](https://meta.discourse.org/tag/release-notes), либо на сайте [GitHub](https://github.com/discourse/discourse/commits/main)
 
       - Посетите наш форум [meta.discourse.org](https://meta.discourse.org) для получения последних новостей, обсуждений и (в случае необходимости) оперативной технической поддержки.
   new_version_mailer_with_notes:
@@ -2676,7 +2677,7 @@ ru:
 
       - Обновитесь, используя наш способ онлайн-обновления** [в один клик](%{base_url}/admin/upgrade)**
 
-      - Посмотрите, что появилось нового в последней версии: либо на [нашем сайте](https://meta.discourse.org/tag/release-notes), либо на сайте [GitHub](https://github.com/discourse/discourse/commits/master)
+      - Посмотрите, что появилось нового в последней версии: либо на [нашем сайте](https://meta.discourse.org/tag/release-notes), либо на сайте [GitHub](https://github.com/discourse/discourse/commits/main)
 
       - Посетите наш форум [meta.discourse.org](https://meta.discourse.org) для получения последних новостей, обсуждений и (в случае необходимости) оперативной технической поддержки.
 
@@ -3269,6 +3270,7 @@ ru:
   subject_re: "Re:"
   subject_pm: "[ЛС]"
   email_from: "%{user_name} через %{site_name}"
+  email_from_without_site: "%{user_name}"
   user_notifications:
     previous_discussion: "Предыдущие ответы"
     reached_limit:
@@ -3285,7 +3287,7 @@ ru:
     only_reply_by_email: "Ответьте на это письмо по электронной почте."
     only_reply_by_email_pm: "Ответьте на это личное сообщение от %{participants} по электронной почте."
     visit_link_to_respond: "Для ответа [посетите эту тему](%{base_url}%{url})."
-    visit_link_to_respond_pm: "[Откройте это личное сообщение](%{base_url}%{url}) для ответа на это письмо от %{participants}."
+    visit_link_to_respond_pm: "Для ответа на письмо [откройте это личное сообщение](%{base_url}%{url}).\nАдресаты: %{participants}."
     reply_above_line: "## Пожалуйста, напечатайте ответ над этой линией. ##"
     posted_by: "Отправлено пользователем %{username} %{post_date}"
     pm_participants: "Участники: %{participants}"
@@ -3490,6 +3492,9 @@ ru:
         Вы были заморожены на форуме до %{suspended_till}.
 
         Причина: %{reason}
+    account_suspended_forever:
+      title: "Учётная запись заморожена"
+      subject_template: "[%{email_prefix}] Ваш аккаунт был заморожен"
     account_silenced:
       title: "Учётная запись заблокирована"
       subject_template: "[%{email_prefix}] Ваш аккаунт был заблокирован"
@@ -3497,6 +3502,9 @@ ru:
         Вы были заблокированы на форуме до %{silenced_till}.
 
         Причина: %{reason}
+    account_silenced_forever:
+      title: "Учётная запись заблокирована"
+      subject_template: "[%{email_prefix}] Ваш аккаунт был заблокирован"
     account_exists:
       title: "Учётная запись уже существует"
       subject_template: "[%{email_prefix}] Учётная запись уже существует"
@@ -4075,7 +4083,9 @@ ru:
     mass_award:
       errors:
         invalid_csv: Мы обнаружили ошибку в строке %{line_number}. Пожалуйста, проверьте, что в CSV-файле указано одно электронное письмо на строку.
+        too_many_csv_entries: Слишком много записей в CSV-файле. Пожалуйста, загрузите файл с не более чем %{count} записями.
         badge_disabled: Сначала активируйте использование награды %{badge_name}.
+        cant_grant_multiple_times: Невозможно присвоить награду %{badge_name} несколько раз одному и тому же пользователю.
     editor:
       name: Редактор
       description: Первое редактирование сообщения
diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml
index 64ddf7e16a..37d6f8019b 100644
--- a/config/locales/server.sk.yml
+++ b/config/locales/server.sk.yml
@@ -1044,7 +1044,6 @@ sk:
       topic: "Výsledky"
       user: "Používatelia"
   original_poster: "Pôvodný autor"
-  most_posts: "Najviac príspevkov"
   most_recent_poster: "Najaktuálnejší prispievateľ"
   frequent_poster: "Častý prispievateľ"
   redirected_to_top_reasons:
diff --git a/config/locales/server.sl.yml b/config/locales/server.sl.yml
index f00a2ac5e6..4bd87a80ec 100644
--- a/config/locales/server.sl.yml
+++ b/config/locales/server.sl.yml
@@ -1570,9 +1570,15 @@ sl:
     account_suspended:
       title: "Suspendiran račun"
       subject_template: "[%{email_prefix}] Vaš uporabniški račun je bil suspendiran"
+    account_suspended_forever:
+      title: "Suspendiran račun"
+      subject_template: "[%{email_prefix}] Vaš uporabniški račun je bil suspendiran"
     account_silenced:
       title: "Utišan račun"
       subject_template: "[%{email_prefix}] Vaš uporabniški račun je bil utišan"
+    account_silenced_forever:
+      title: "Utišan račun"
+      subject_template: "[%{email_prefix}] Vaš uporabniški račun je bil utišan"
     account_exists:
       title: "Račun že obstaja"
       subject_template: "[%{email_prefix}] Račun že obstaja"
diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml
index a7d6ccf654..138900971f 100644
--- a/config/locales/server.sq.yml
+++ b/config/locales/server.sq.yml
@@ -828,7 +828,6 @@ sq:
       topic: "Results"
       user: "Users"
   original_poster: "Postuesi fillestar"
-  most_posts: "Most Posts"
   most_recent_poster: "Postuesi i përgjigjes së fundit"
   frequent_poster: "Postues i shpeshtë"
   redirected_to_top_reasons:
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index 76a9ebb640..7b00dc542d 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -797,7 +797,7 @@ sv:
     please_continue: "Fortsätt till %{site_name}"
     error: "Det uppstod ett fel vid ändringen av din e-postadress. Kanske används adressen redan?"
     doesnt_exist: "Den e-postadressen är inte kopplad till ditt konto."
-    error_staged: "Ett problem uppstod vid ändring av din e-postadress. Adressen används redan av en annan användare."
+    error_staged: "Ett problem uppstod vid ändring av din e-postadress. Adressen används redan av en arrangerad användare."
     already_done: "Tyvärr har den här aktiveringslänken löpt ut. Kanske har din e-postadress ändrats redan?"
     confirm: "Bekräfta"
     max_secondary_emails_error: "Du har nått gränsen för maximalt antal sekundära e-postmeddelanden."
@@ -1499,6 +1499,7 @@ sv:
     gtm_container_id: "Innehålls-ID för Google Tag Manager. t.ex. GTM-ABCDEF. <br/>Notera: Skript från tredje part som laddats av GTM kan behöva vitlistas i 'content security policy script src'."
     enable_escaped_fragments: "Återgå till Googles Ajax-Crawling API om ingen sökrobot upptäcks. Se <a href='https://developers.google.com/webmasters/ajax-crawling/docs/learn-more' target='_blank'>https://developers.google.com/webmasters/ajax-crawling/docs/learn-more</a>"
     moderators_manage_categories_and_groups: "Tillåt moderatorer att hantera kategorier och grupper"
+    moderators_change_post_ownership: "Tillåt att moderatorer ändrar inläggsägarskap"
     cors_origins: "Tillåtna ursprung för cross-ursprungsbegäran (CORS). Varje ursprung måste inkludera http:// eller https://. Variabeln DISCOURSE_ENABLE_CORS env måste ställas in till true för att aktivera CORS."
     use_admin_ip_allowlist: "Administratörer kan bara logga in om de är på en IP-adress som definierats i listan över granskade IP-adresser (Admin > Loggar > Granskade IP-adresser)."
     blocked_ip_blocks: "En lista över privata IP-block som aldrig bör genomsökas av Discourse"
@@ -1574,11 +1575,11 @@ sv:
     auth_overrides_email: "Åsidosätter lokal e-post med externa webbplatsers e-post vid varje inloggning samt förhindrar lokala ändringar. (VARNING: diskrepanser kan inträffa på grund av normalisering av lokala e-postadresser)"
     auth_overrides_username: "Åsidosätter lokala användarnamn med externa webbplatsers användarnamn vid varje inloggning samt förhindrar lokala ändringar. (VARNING: diskrepanser kan inträffa på grund av skillnader i användarnamnets längd/krav)"
     auth_overrides_name: "Åsidosätter lokala fullständiga namn med externa webbplatsers fullständiga namn vid varje inloggning samt förhindrar lokala ändringar. Gäller för alla tjänster för auktorisering."
-    discourse_connect_overrides_avatar: "Åsidosätter användaravatar med extern webbplatsavatar från DiscourseConnect-nyttolast. Om detta är aktiverat kan användare inte ladda upp avatarer på Discourse."
-    discourse_connect_overrides_location: "Åsidosätter användarens plats med plats hämtad externt från DiscourseConnect-nyttolast och förhindrar sedan lokala ändringar."
-    discourse_connect_overrides_website: "Åsidosätter användarens webbplats med plats hämtad externt från DiscourseConnect-nyttolast och förhindrar sedan lokala ändringar."
-    discourse_connect_overrides_profile_background: "Åsidosätter användarprofilbakgrund med extern webbplatsavatar från DiscourseConnect-nyttolast."
-    discourse_connect_overrides_card_background: "Åsidosätter användarkortsbakgrund med extern webbplatsavatar från DiscourseConnect-nyttolast."
+    discourse_connect_overrides_avatar: "Åsidosätter användaravatar med värde från DiscourseConnect-nyttolast. Om detta är aktiverat får användare inte ladda upp avatarer på Discourse."
+    discourse_connect_overrides_location: "Åsidosätter användarens plats med värde från DiscourseConnect-nyttolast och förhindrar sedan lokala ändringar."
+    discourse_connect_overrides_website: "Åsidosätter användarens webbplats med värde från DiscourseConnect-nyttolast och förhindrar sedan lokala ändringar."
+    discourse_connect_overrides_profile_background: "Åsidosätter användarprofilbakgrund med värde från DiscourseConnect-nyttolast."
+    discourse_connect_overrides_card_background: "Åsidosätter användarkortsbakgrund med värde från DiscourseConnect-nyttolast."
     discourse_connect_not_approved_url: "Omdirigera icke-godkända DiscourseConnect-konton till den här URL:en"
     discourse_connect_allows_all_return_paths: "Begränsa inte domänen för return_paths som tillhandahålls av DiscourseConnect (som standard måste retursökvägen finnas på den aktuella webbplatsen)"
     enable_local_logins: "Aktivera konton baserade på lokala användarnamn och lösenordsinloggning. VARNING: om detta har inaktiverats kan du kanske inte logga in om du inte tidigare har konfigurerat minst en alternativ inloggningsmetod."
@@ -1676,7 +1677,7 @@ sv:
     allow_staff_to_upload_any_file_in_pm: "Låt personalen ladda upp alla filer i PM."
     strip_image_metadata: "Radera metadata för bild."
     composer_media_optimization_image_enabled: "Möjliggör medieoptimering på klientsidan av uppladdade bildfiler."
-    composer_media_optimization_image_kilobytes_optimization_threshold: "Minsta bildfilstorlek för att utlösa optimering på klientsidan"
+    composer_media_optimization_image_bytes_optimization_threshold: "Minsta bildfilstorlek för att utlösa optimering på klientsidan"
     composer_media_optimization_image_resize_dimensions_threshold: "Minsta bildbredd för att utlösa storleksändring på klientsidan"
     composer_media_optimization_image_resize_width_target: "Bilder med större bredd än `composer_media_optimization_image_dimensions_resize_threshold` kommer att ändras till denna bredd. Måste vara >= än `composer_media_optimization_image_dimensions_resize_threshold`."
     composer_media_optimization_image_encode_quality: "JPEG-kodningskvalitet som används i omkodningsprocessen."
@@ -1903,7 +1904,7 @@ sv:
     ignored_users_count_message_threshold: "Meddela moderatorer om en viss användare ignoreras av många andra användare."
     ignored_users_message_gap_days: "Hur lång tid att vänta innan moderatorer meddelas igen om en användare som ignorerats av många andra."
     clean_up_inactive_users_after_days: "Antal dagar innan en inaktiv användare (förtroendenivå 0 utan några inlägg) tas bort. Ställ in till 0 för att inaktivera rensning."
-    clean_up_unused_staged_users_after_days: "Antal dagar innan en fiktiv användare (utan några inlägg) tas bort. Sätt till 0 för att inaktivera rensning."
+    clean_up_unused_staged_users_after_days: "Antal dagar innan en oanvänd arrangerad användare (utan några inlägg) tas bort. Ställ in till 0 för att inaktivera rensning."
     user_selected_primary_groups: "Tillåt att användare ställer in sin egna primära grupp"
     max_notifications_per_user: "Maximalt antal aviseringar per användare. Om detta värde överskrids kommer äldre aviseringar att raderas. Verkställs veckovis. Sätt till 0 för att inaktivera."
     allowed_user_website_domains: "Användarens webbplats kommer att verifieras mot dessa domäner. Avgränsad textfil."
@@ -1929,7 +1930,7 @@ sv:
     app_association_ios: "Innehållet i slutpunkten <a href='%{base_path}/apple-app-site-association'>apple-app-site-association</a>, används för att skapa universella länkar mellan denna webbplats och iOS-appar."
     share_anonymized_statistics: "Dela anonymiserad användningsstatistik."
     auto_handle_queued_age: "Hantera automatiskt inlägg som väntar på att granskas efter detta antal dagar. Flaggor ignoreras. Inlägg och användare i kö avvisas. Ställ in till 0 för att inaktivera den här funktionen."
-    penalty_step_hours: "Standardstraff, uttryckt i timmar, för att ha tystat eller stängt av användare. Förval för den första överträdelsen är det första värdet, förval för den andra överträdelsen är det andra värdet etc."
+    penalty_step_hours: "Standardtid, uttryckt i timmar, under vilken användare bestraffas genom att tystas eller stängas av. Det första värdet är standard för deras första överträdelse, det andra värdet är standard för deras andra överträdelse etc."
     svg_icon_subset: "Lägg till ytterligare FontAwesome 5-ikoner som du vill inkludera i dina tillgångar. Använd prefixet 'fa-' för solida ikoner, 'far-' för vanliga ikoner och 'fab-' för märkesikoner."
     max_prints_per_hour_per_user: "Maximalt antal /print page-utskrifter (ställ in till 0 för att inaktivera)"
     full_name_required: "Fullständigt namn är ett obligatoriskt fält i en användares profil."
@@ -1970,7 +1971,7 @@ sv:
     approve_post_count: "Antalet inlägg från en ny användare eller basanvändare som måste godkännas"
     approve_unless_trust_level: "Inlägg för användare under den här förtroendenivån måste godkännas"
     approve_new_topics_unless_trust_level: "Nya ämnen för användare under denna förtroendenivå måste godkännas"
-    approve_unless_staged: "Nya ämnen och inlägg för påhittade användare måste godkännas"
+    approve_unless_staged: "Nya ämnen och inlägg för arrangerade användare måste godkännas"
     notify_about_queued_posts_after: "Om det finns inlägg som har väntat på att granskas i mer än detta antal timmar skickas en avisering till alla moderatorer. Inaktivera dessa aviseringar genom att ställa in till 0."
     auto_close_messages_post_count: "Högsta antal inlägg som tillåts i ett meddelande innan det automatiskt stängs (ange 0 för att inaktivera)"
     auto_close_topics_post_count: "Högsta antal inlägg som tillåts i ett ämne innan det automatiskt stängs (ange 0 för att inaktivera)"
@@ -2061,6 +2062,7 @@ sv:
     share_quote_buttons: "Bestäm vilka objekt som visas i citatdelningswidgeten, samt i vilken ordning."
     share_quote_visibility: "Avgör när du ska visa citatdelningsknappar: aldrig, endast till anonyma användare eller för alla användare. "
     create_revision_on_bulk_topic_moves: "Skapa ny version av första inlägg när ämnen flyttas till en ny kategori i bulk."
+    allow_changing_staged_user_tracking: "Tillåt att aviseringsinställningar för en arrangerad användares kategori och tagg kan ändras av en administratörsanvändare."
     errors:
       invalid_email: "Felaktig e-postadress."
       invalid_username: "Det finns ingen användare med detta användarnamn."
@@ -2132,7 +2134,6 @@ sv:
     missing_secret: "Autentisering misslyckades på grund av saknad hemlighet. Kontakta webbplatsens administratör för att åtgärda problemet."
     invite_redeem_failed: "Inbjudan kunde inte lösas in. Kontakta webbplatsens administratör."
   original_poster: "Ursprunglig skribent"
-  most_posts: "Flest inlägg"
   most_recent_poster: "Senaste skribent"
   frequent_poster: "Flitig skribent"
   poster_description_joiner: ", "
@@ -2235,6 +2236,7 @@ sv:
     reset_not_allowed_from_ip_address: "Du kan inte begära en återställning av lösenord från den IP-adressen."
     suspended: "Du kan inte logga in förrän %{date}."
     suspended_with_reason: "Konto avstängt t.o.m. %{date}: %{reason}"
+    suspended_with_reason_forever: "Konto avstängt: %{reason}"
     errors: "%{errors}"
     not_available: "Inte tillgänglig. Testa %{suggestion}?"
     something_already_taken: "Något gick fel. Kanske har användarnamnet eller e-postadressen redan registrerats. Testa Glömt lösenord-länken."
@@ -2317,7 +2319,7 @@ sv:
     auto_rejected: "Avvisas automatiskt på grund av ålder. Se webbplatsinställning auto_handle_queued_age ."
     destroy_reasons:
       unused_staged_user: "Oanvänd arrangerad användare"
-      fixed_primary_email: "Fast primär e-postadress för påhittade användare"
+      fixed_primary_email: "Fast primär e-postadress för arrangerad användare"
       same_ip_address: "Samma IP-adress (%{ip_address}) som andra användare"
       inactive_user: "Inaktiv användare"
       reviewable_reject_auto: "Automatisk hantering av köade granskningsbara"
@@ -2475,25 +2477,9 @@ sv:
   new_version_mailer:
     title: "E-post om ny version"
     subject_template: "[%{email_prefix}] Ny version av Discourse, uppdatering tillgänglig"
-    text_body_template: "Hurra, en ny version av [Discourse](http://www.discourse.org) är tillgänglig!\n\nDin version: %{installed_version}\nNy version: **%{new_version}**\n\n- Uppgradera genom att använda den enkla **[uppgraderingsknappen](%{base_url}/admin/upgrade)** \n\n- Se vad som är nytt i [uppdateringsnoteringarna](https://meta.discourse.org/tag/release-notes) eller läs i [GitHubs råa ändringslogg](https://github.com/discourse/discourse/commits/master)\n\n- Besök [meta.discourse.org](http://meta.discourse.org) för att läsa de senaste nyheterna, diskutera eller få hjälp angående Discourse\n"
   new_version_mailer_with_notes:
     title: "E-post om ny version med anteckningar"
     subject_template: "[%{email_prefix}] Uppdatering tillgänglig"
-    text_body_template: |
-      Hurra, en ny version av [Discourse](http://www.discourse.org) är tillgänglig!
-
-      Din version: %{installed_version}
-      Ny version: **%{new_version}**
-
-      - Uppgradera genom att använda den enkla **[uppgraderingsknappen](%{base_url}/admin/upgrade)**
-
-      - Se vad som är nytt i [uppdateringsnoteringarna](https://meta.discourse.org/tag/release-notes) eller läs i [GitHubs råa ändringslogg](https://github.com/discourse/discourse/commits/master)
-
-      - Besök [meta.discourse.org](http://meta.discourse.org) för att läsa de senaste nyheterna, diskutera eller få hjälp angående Discourse
-
-      ### Uppdateringsnoteringar
-
-      %{notes}
   flag_reasons:
     off_topic: "Ditt inlägg blev flaggat som **irrelevant**. Medlemmarna i forumet kände att det inte är passande för ämnet, som definieras av rubriken och det första inlägget."
     inappropriate: "Ditt inlägg blev flaggat som **olämpligt**. Medlemmarna i forumet kände att det är störande, kränkande eller att det strider mot [våra riktlinjer](%{base_path}/guidelines)."
@@ -3000,6 +2986,7 @@ sv:
   subject_re: "Sv: "
   subject_pm: "[PM] "
   email_from: "%{user_name} via %{site_name}"
+  email_from_without_site: "%{user_name}"
   user_notifications:
     previous_discussion: "Föregående svar"
     reached_limit:
@@ -3040,7 +3027,7 @@ sv:
 
         %{respond_instructions}
     user_invited_to_private_message_pm_staged:
-      title: "Användare inbjuden till arrangerat PM"
+      title: "Användare inbjuden till PM är arrangerad"
       subject_template: "[%{email_prefix}] %{username} har bjudit in dig till ett meddelande '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
@@ -3168,7 +3155,7 @@ sv:
 
         %{respond_instructions}
     user_posted_pm_staged:
-      title: "Användare publicerade arrangerat PM"
+      title: "Användare publicerade PM som arrangerad"
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
@@ -3179,6 +3166,13 @@ sv:
       text_body_template: |
         Du har blivit avstängd från forumet till och med %{suspended_till}.
 
+        Orsak - %{reason}
+    account_suspended_forever:
+      title: "Konto avstängt"
+      subject_template: "[%{email_prefix}] Ditt konto har stängts av"
+      text_body_template: |
+        Du har blivit avstängd från forumet.
+
         Orsak - %{reason}
     account_silenced:
       title: "Konto tystat"
@@ -3186,6 +3180,13 @@ sv:
       text_body_template: |
         Du har tystats i forumet till och med %{silenced_till}.
 
+        Orsak - %{reason}
+    account_silenced_forever:
+      title: "Konto tystat"
+      subject_template: "[%{email_prefix}] Ditt konto har tystats"
+      text_body_template: |
+        Du har tystats i forumet.
+
         Orsak - %{reason}
     account_exists:
       title: "Konto finns redan"
@@ -3643,7 +3644,9 @@ sv:
     mass_award:
       errors:
         invalid_csv: Vi stötte på ett fel på rad %{line_number}. Bekräfta att CSV har en e-postadress per rad.
+        too_many_csv_entries: För många poster i CSV-filen. Ange en CSV-fil med högst %{count} poster.
         badge_disabled: Aktivera först utmärkelsen %{badge_name}.
+        cant_grant_multiple_times: Det går inte att utfärda utmärkelsen %{badge_name} flera gånger till en enda användare.
     editor:
       name: Redigerare
       description: Första inläggsredigeringen
diff --git a/config/locales/server.sw.yml b/config/locales/server.sw.yml
index 41a2e381f1..9763fc5e6e 100644
--- a/config/locales/server.sw.yml
+++ b/config/locales/server.sw.yml
@@ -984,7 +984,6 @@ sw:
     no_email: "Hakuna barua pepe iliyoandikwa. Tafadhali wasiliana na msimamizi wa tovuti."
     email_error: "Akaunti haijaweza kusajiliwa na barua pepe<b>%{email}</b>Tafadhali wasiliana na msimamizi wa tovuti."
   original_poster: "Muandishi wa Kwanza"
-  most_posts: "Machapisho Mengi"
   most_recent_poster: "Mwandishi wa hivi karibuni"
   frequent_poster: "Mwandishi wa mara kwa mara"
   redirected_to_top_reasons:
@@ -1613,9 +1612,15 @@ sw:
     account_suspended:
       title: "Akaunti Imesimamishwa"
       subject_template: "[%{email_prefix}] Akaunti yako imesimamishwa"
+    account_suspended_forever:
+      title: "Akaunti Imesimamishwa"
+      subject_template: "[%{email_prefix}] Akaunti yako imesimamishwa"
     account_silenced:
       title: "Akaunti imenyamazishwa"
       subject_template: "[%{email_prefix}] Akaunti yako imenyamazishwa"
+    account_silenced_forever:
+      title: "Akaunti imenyamazishwa"
+      subject_template: "[%{email_prefix}] Akaunti yako imenyamazishwa"
     account_exists:
       title: "Akaunti tayari ipo"
       subject_template: "[%{email_prefix}] Akaunti tayari ipo"
diff --git a/config/locales/server.te.yml b/config/locales/server.te.yml
index a7cff73506..8548116042 100644
--- a/config/locales/server.te.yml
+++ b/config/locales/server.te.yml
@@ -583,7 +583,6 @@ te:
       topic: "ఫలితాలు"
       user: "సభ్యులు"
   original_poster: "మూల టపా రచయిత"
-  most_posts: "అధిక టపాలు"
   most_recent_poster: "ఇటీవలి పోస్టర్"
   frequent_poster: "తరచూ వచ్చే పోస్టర్"
   publish_page:
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index 91ed40fa33..6b907b9d5b 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -674,9 +674,11 @@ tr_TR:
       topics_per_day: "Günlük izin verilen maksimum yeni konu sayısına ulaştınız. %{time_left} sonra daha fazla yeni konu oluşturabilirsiniz."
       pms_per_day: "Günlük izin verilen maksimum gönderi sayısına ulaştınız. %{time_left} sonra daha fazla yeni gönderi oluşturabilirsiniz."
       create_like: "Vaaay! Epey beğeni dağıttınız! Bugün için maksimum günlük beğeni sayısına ulaştınız, ancak güven seviyeleri kazandıkça daha fazla günlük beğeni kullanabileceksiniz. %{time_left} sonra tekrar beğeni verebileceksiniz."
+      create_bookmark: "Maksimum günlük yer işareti sayısına ulaştınız. %{time_left} sonra daha fazla yer imi oluşturabilirsiniz."
       edit_post: "Maksimum günlük düzenleme sayısına ulaştınız. %{time_left} sonra daha fazla düzenleme yapabilirsiniz."
       live_post_counts: "Çok hızlı bir şekilde canlı yayın sayımı istiyorsunuz. Lütfen tekrar denemeden önce %{time_left} bekleyin."
       unsubscribe_via_email: "E-postayla maksimum abonelik iptali sayısına ulaştınız. Lütfen tekrar denemeden önce %{time_left} bekleyin."
+      topic_invitations_per_day: "Maksimum konu daveti sayısına ulaştınız. %{time_left} sonra daha fazla davetiye gönderebilirsiniz."
     hours:
       one: "%{count} saat"
       other: "%{count} saat"
@@ -899,7 +901,15 @@ tr_TR:
     no_drafts:
       self: "Taslağın yok; Herhangi bir konuda cevap yazmaya başladığınızda otomatik olarak yeni taslak olarak kaydedilecek."
   email_settings:
+    pop3_authentication_error: "Sağlanan POP3 kimlik bilgileriyle ilgili bir sorun oluştu, kullanıcı adını ve şifreyi kontrol edip tekrar deneyin."
+    imap_authentication_error: "Sağlanan IMAP kimlik bilgileriyle ilgili bir sorun oluştu, kullanıcı adını ve şifreyi kontrol edip tekrar deneyin."
+    imap_no_response_error: "IMAP sunucusuyla iletişim kurarken bir hata oluştu. %{message}"
+    smtp_authentication_error: "Sağlanan SMTP kimlik bilgileriyle ilgili bir sorun oluştu, kullanıcı adını ve şifreyi kontrol edip tekrar deneyin."
+    authentication_error_gmail_app_password: 'Uygulamaya özel şifre gereklidir. <a target="_blank" href="https://support.google.com/accounts/answer/185833">Şu Google Yardım makalesinden</a> daha fazla bilgi edinin'
     smtp_server_busy_error: "SMTP sunucusu şu anda meşgul, daha sonra yeniden deneyin."
+    smtp_unhandled_error: "SMTP sunucusuyla iletişim kurarken bir hata oluştu. %{message}"
+    imap_unhandled_error: "IMAP sunucusuyla iletişim kurarken bir hata oluştu. %{message}"
+    connection_error: "Sunucuya bağlanırken bir sorun oluştu, sunucu adını ve bağlantı noktasını kontrol edin ve tekrar deneyin."
     timeout_error: "Sunucuya bağlantı zaman aşımına uğradı, sunucu adını ve bağlantı portunu kontrol edip tekrar deneyin."
     unhandled_error: "E-posta ayarları test edilirken hata oluştu. %{message}"
   webauthn:
@@ -1351,6 +1361,7 @@ tr_TR:
     out_of_date_themes: "Aşağıdaki temalar için güncellemeler mevcuttur:"
     unreachable_themes: "Aşağıdaki temalar için güncellemeleri kontrol edemedik:"
   site_settings:
+    display_local_time_in_user_card: "Kullanıcı kartı açıkken yerel saati kullanıcının saat dilimine göre görüntüle."
     censored_words: "kelime yerine otomatik olarak &#9632;&#9632;&#9632;&#9632; kullanılacak kelimeler"
     delete_old_hidden_posts: "30 günden fazla süreyle gizli kalan gizlenmiş gönderileri otomatik olarak sil."
     default_locale: "Bu Söylem örneğinin varsayılan dili. <a href='%{base_path}/admin/customize/site_texts' target='_blank'>Özelleştir / Metin</a>ile sistem tarafından oluşturulan kategorilerin ve konuların metnini değiştirebilirsiniz."
@@ -1403,6 +1414,7 @@ tr_TR:
     add_rel_nofollow_to_user_content: 'İç bağlantılar (ana alan adları dahil) hariç, gönderilen tüm kullanıcı içeriklerine rel nofollow ekle. Bu ayarı değiştirirseniz, tüm gönderileri "rake post:rebake" ile yeniden işlemeniz gerekir.'
     exclude_rel_nofollow_domains: "nofollow eklenmeyecek sınırlandırılmış alan adları listesi. ust.ornek.com'a izin verirseniz otomatik olarak alt.ornek.com'a da izin verilir. Web tarayıcılarının tüm içeriği bulmasına yardımcı olmak için bu sitenin alan adını en azından eklemelisiniz. Web sitenizin diğer bölümleri başka alan adlarındaysa, bunları da ekleyin."
     post_excerpt_maxlength: "Gönderi alıntısının / özetinin en fazla uzunluğu."
+    topic_excerpt_maxlength: "Bir konudaki ilk gönderiden oluşturulan bir konu alıntısının / özetinin maksimum uzunluğu."
     show_pinned_excerpt_mobile: "Mobil görünümünde başa tutturulmuş konuların özetini göster."
     show_pinned_excerpt_desktop: "Masaüstü görünümünde başa tutturulmuş konuların özetini göster."
     post_onebox_maxlength: "Kutulanmış bir Discourse gönderisinin en fazla karakter uzunluğu"
@@ -1410,10 +1422,14 @@ tr_TR:
     allowed_inline_onebox_domains: "Başlıksız bağlanırsa minyatür formda yayınlanacak alanların listesi"
     force_custom_user_agent_hosts: "Tüm isteklerde özel onebox kullanıcı aracısını kullanacak ana makineler. (Özellikle kullanıcı aracısıyla erişimi sınırlayan ana bilgisayarlar için kullanışlıdır)."
     max_oneboxes_per_post: "Gönderide olabilecek en fazla kutulama sayısı"
+    facebook_app_access_token: "Facebook uygulama kimliğinizden ve gizli dizenizden (secret) bir token oluşturuldu. Instagram onebox'larını oluşturmak için kullanılır."
     logo: "Sitenizin sol üst tarafındaki logo resmi. Yüksekliği 120 ve en boy oranı 3: 1 den büyük olan geniş dikdörtgen bir görüntü kullanın. Boş bırakılırsa, site başlığı metni gösterilir."
     logo_small: "Aşağı kaydırırken sitenizin sol üst köşesinde görülen küçük logo resmi. 120 × 120 kare bir görüntü kullanın. Boş bırakılırsa, bir ev glifi gösterilir."
     digest_logo: "Sitenizin e-posta özetinin en üstünde kullanılan alternatif logo resmi. Geniş bir dikdörtgen görüntü kullanın. SVG görüntüsü kullanmayın. Boş bırakılırsa, “logo” ayarındaki görüntü kullanılır."
     mobile_logo: "Sitenizin mobil sürümünde kullanılan logo. Yüksekliği 120 ve en boy oranı 3: 1 den büyük olan geniş dikdörtgen bir görüntü kullanın. Boş bırakılırsa, “logo” ayarındaki görüntü kullanılır."
+    logo_dark: "'Logo' ayarı için koyu şema alternatifi."
+    logo_small_dark: "'Logo küçük' ayarı için koyu şema alternatifi."
+    mobile_logo_dark: "'Mobil logo' ayarı için koyu şema alternatifi."
     large_icon: "Diğer meta veri simgeleri için temel olarak kullanılan resim. İdeal olarak 512 x 512 den büyük olmalıdır. Boş bırakılırsa logo_small kullanılacaktır."
     manifest_icon: "Android de logo/splash görüntüsü olarak kullanılan resim. Otomatik şekilde 512 × 512 olarak yeniden boyutlandırılır. Boş bırakılırsa, large_icon kullanılır."
     favicon: "Siteniz için bir simge, bkz. <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>Https://en.wikipedia.org/wiki/Favicon</a> . Bir CDN üzerinde düzgün çalışmak için bir png olması gerekir. 32x32 olarak yeniden boyutlandırılacak. Boş bırakılırsa, large_icon kullanılır."
@@ -1445,6 +1461,9 @@ tr_TR:
     tl2_additional_likes_per_day_multiplier: "Güvenlik seviyesi 2 (Üye) olanlar için günlük beğeni limitini bu rakamla çarparak artır"
     tl3_additional_likes_per_day_multiplier: "Güven seviyesi 3 (Müdavim) olanlar için günlük beğeni limitini bu rakamla çarparak artır"
     tl4_additional_likes_per_day_multiplier: "Güvenlik seviyesi 4 (Lider) olanlar için günlük beğeni limitini bu rakamla çarparak artır"
+    tl2_additional_edits_per_day_multiplier: "Güvenlik seviyesi 2 (üye) olanlar için günlük düzenleme limitini bu rakamla çarparak artır"
+    tl3_additional_edits_per_day_multiplier: "Güven seviyesi 3 (müdavim) olanlar için günlük düzenleme limitini bu rakamla çarparak artır"
+    tl4_additional_edits_per_day_multiplier: "Güvenlik seviyesi 4 (lider) olanlar için günlük düzenleme limitini bu rakamla çarparak artır"
     num_users_to_silence_new_user: "Eğer, yeni bir kullanıcının gönderileri buradaki sayı kadar farklı kullanıcı tarafından num_flags_to_block_new_user rapor alırsa, kullanıcının bütün gönderilerini gizle ve yeni gönderi oluşturabilmesine izin verme. Devre dışı bırakmak için 0 girin."
     num_tl3_flags_to_silence_new_user: "Eğer, yeni bir kullanıcının gönderileri num_flags_to_block_new_user güven düzeyi 3 olan farklı kullanıcılardan buradaki sayı kadar bayrak alırsa , kullanıcının bütün gönderilerini gizle ve yeni gönderi oluşturabilmesine izin verme. Devre dışı bırakmak için 0 girin."
     num_tl3_users_to_silence_new_user: "Eğer, yeni bir kullanıcının gönderileri buradaki sayı kadar farklı güven seviyesi 3 olan kullanıcı tarafından num_flags_to_block_new_user rapor alırsa, kullanıcının bütün gönderilerini gizle ve yeni gönderi oluşturabilmesine izin verme. Devre dışı bırakmak için 0 girin."
@@ -1457,15 +1476,25 @@ tr_TR:
     markdown_typographer_quotation_marks: "Çift ve tek tırnak değiştirme çiftlerinin listesi"
     post_undo_action_window_mins: "Bir gönderide yapılan yeni eylemlerin (beğenme, bildirme vb) geri alınabileceği zaman, dakika olarak"
     must_approve_users: "Siteye erişimlerine izin verilmeden önce tüm yeni kullanıcı hesaplarının görevliler tarafından onaylanması gerekir."
+    invite_code: "Kullanıcı, hesap kaydına izin vermek için bu kodu yazmalıdır, boş olduğunda yoksayılır (büyük/küçük harfe duyarlı değildir)"
+    approve_suspect_users: "Şüpheli kullanıcıları inceleme kuyruğuna ekle. Şüpheli kullanıcılar bir biyo/web sitesi girdiler, ancak herhangi bir okuma etkinliğine sahip değiller."
     review_every_post: "Tüm gönderiler gözden geçirilmelidir. UYARI! YOĞUN SİTELER İÇİN ÖNERİLMEZ."
     pending_users_reminder_delay_minutes: "Yeni kullanıcılar bu kadar dakikadan daha uzun süredir onay bekliyorsa moderatörleri bilgilendir. Bildirimleri devre dışı bırakmak için -1 olarak ayarlayın."
     persistent_sessions: "Web tarayıcısı kapatıldığında kullanıcıların oturumları açık kalacak"
     maximum_session_age: "Kullanıcı son ziyaretinden bu yana n saat boyunca giriş yapmış olarak kalacak"
+    ga_version: "Kullanılacak Google Universal Analytics sürümü: v3 (analytics.js), v4 (gtag)"
+    ga_universal_tracking_code: "Google Universal Analytics izleme kodu kimliği, örnek: UA-12345678-9; bkz. <a href='https://google.com/analytics' target='_blank'>ttps://google.com/analytics</a>"
+    ga_universal_domain_name: "Google Universal Analytics alan adı, örn: sitem.com; bkz. <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
+    ga_universal_auto_link_domains: "Google Universal Analytics alan adları arası izlemeyi etkinleştirin. Bu alan adlarına giden bağlantılara istemci kimliği eklenecektir. <a href='https://support.google.com/analytics/answer/1034342?hl=en' target='_blank'>Google'ın Web Alanları Arası İzleme kılavuzuna</a> bakın."
+    gtm_container_id: "Google Etiket Yöneticisi kapsayıcı kimliği. örn: GTM-ABCDEF. <br/> Not: GTM tarafından yüklenen üçüncü taraf komut dosyalarının 'content security policy script src' içinde izin verilenler listesine eklenmesi gerekebilir."
     enable_escaped_fragments: "Eğer bir ağ gezgini algılanmazsa Google'ın Ajax Crawling API'ına geri dönün. Bkz. <a href='https://developers.google.com/webmasters/ajax-crawling/docs/learn-more' target='_blank'>Https://developers.google.com/webmasters/ajax-crawling/docs/learn-more</a>"
+    moderators_manage_categories_and_groups: "Moderatörlerin kategorileri ve grupları yönetmesine izin ver"
+    moderators_change_post_ownership: "Moderatörlerin gönderi sahipliğini değiştirmesine izin ver"
     cors_origins: "Cross-origin isteklerin (CORS) izin verilen originler. Her origin http:// veya https:// içermeli. CORS'u etkinleştirebilmek için DISCOURSE_ENABLE_CORS env değişkeni doğru olarak ayarlanmalı."
     use_admin_ip_allowlist: "Yöneticiler, sadece Taranmış IP listesinde tanımlanmış bir IP adresinden erişim sağlıyorlarsa giriş yapabilirler. (Yönetici > Kayıtlar > Taranmış IP'ler)"
     blocked_ip_blocks: "Hiçbir zaman Discourse tarafından taranmaması gereken özel IP bloklarının bir listesi"
     allowed_internal_hosts: "Discourse ve diğer amaçlarla güvenli bir şekilde tarama yapabilen dahili ana bilgisayarların bir listesi"
+    allowed_onebox_iframes: "Onebox yerleştirmeleri aracılığıyla izin verilen iframe src etki alanlarının listesi. `*` tüm varsayılan Onebox motorlarına izin verir."
     allowed_iframes: "Gönderilerde güvenli bir şekilde izin verebilecek iframe src alan adı öneklerinin listesi"
     allowed_crawler_user_agents: "Siteye erişmesine izin verilmesi gereken ağ tarayıcılarının kullanıcı aracıları. UYARI! BU AYARLAR, BURADA LİSTEN OLMAYAN TÜM TARAYICILARI ÇIKARACAKTIR!"
     slow_down_crawler_user_agents: "Tarama gecikmesi yönergesi kullanılarak robots.txt dosyasında hız sınırlaması gereken ağ tarayıcılarının kullanıcı aracıları"
@@ -1483,6 +1512,7 @@ tr_TR:
     site_contact_group_name: "Tüm otomatik mesajlara davet edilecek geçerli bir grup adı."
     send_welcome_message: "Tüm yeni kullanıcılara bir hoş geldiniz iletisi ile beraber hızlı başlangıç kılavuzu gönderin."
     send_tl1_welcome_message: "Yeni güven düzeyi 1 kullanıcılarına hoş geldiniz iletisi gönderin."
+    send_tl2_promotion_message: "Yeni güven düzeyi 2 kullanıcılarına yükseltme hakkında bir mesaj gönderin."
     suppress_reply_directly_below: "Bu gönderinin direk altında sadece tek bir cevap varsa, gönderideki açılabilir cevap sayısı bölümünü gösterme."
     suppress_reply_directly_above: "Bu gönderinin direk üstünde sadece tek bir cevap varsa, gönderideki açılabilir hangi-cevaba-istinaden-cevapla bölümünü gösterme."
     remove_full_quote: "Doğrudan yanıtlardaki tüm alıntıları otomatik olarak kaldırın."
@@ -1495,6 +1525,7 @@ tr_TR:
     moderators_view_emails: "Moderatörlerin kullanıcı e-postalarını görüntülemesine izin ver"
     prioritize_username_in_ux: "Kullanıcı sayfası, kullanıcı kartı ve gönderilerde kullanıcı adını ilk olarak göster(devre dışı ise gerçek isim önce gözükür)"
     enable_rich_text_paste: "Besteciye metin yapıştırırken otomatik HTML'den Markdown'a dönüştürme özelliğini etkinleştirin. (Deneysel)"
+    send_old_credential_reminder_days: "Kimlik bilgilerinin değiştirilmesini hatırlatma için frekans (gün)"
     email_token_valid_hours: "Parolamı unuttum / hesap etkinleştirme jetonları (n) saat geçerlidir."
     enable_badges: "Rozet sistemini etkinleştir"
     max_favorite_badges: "Kullanıcının seçebileceği maksimum rozet sayısı"
@@ -1502,6 +1533,7 @@ tr_TR:
     allow_index_in_robots_txt: "Robots.txt dosyasında bu sitenin web arama motorları tarafından dizine eklenmesine izin verildiğini belirtin. İstisnai durumlarda kalıcı olarak <a href='%{base_path}/admin/customize/robots'>robots.txt dosyasını geçersiz kılabilirsiniz </a>."
     blocked_email_domains: "Kullanıcıların kayıt olurken kullanamayacağı e-posta alan adlarının, dikey çizgilerle ayrıştırılmış listesi. Örneğin: mailinator.com|trashmail.net"
     allowed_email_domains: "Kullanıcıların kayıt olurken kullanmak ZORUNDA olduğu e-posta alan adlarının, dikey çizgilerle ayrıştırılmış listesi. UYARI: Bu listede yer almayan e-posta alan adları kabul edilmeyecektir!"
+    auto_approve_email_domains: "E-posta adresleri bu listedeki alan adlarından olan kullanıcılar otomatik olarak onaylanacaktır."
     hide_email_address_taken: "Kullanıcıları, kayıt sırasında ve parolamı unuttum formunda o e-posta adresiyle bir hesap bulunduğunu bildirmeyin."
     log_out_strict: "Çıkış yapılırken, kullanıcının tüm cihazlardaki TÜM seanslarını sonlandır"
     version_checks: "Sürüm güncellemeleri için Discourse Hub'a ping atın ve <a href='%{base_path}/admin' target='_blank'>/ admin</a> kontrol panelinde yeni sürüm mesajlarını gösterin"
@@ -1517,7 +1549,11 @@ tr_TR:
     min_admin_password_length: "Yönetici için parolanın en az uzunluğu."
     password_unique_characters: "Bir parolanın olması gereken minimum benzersiz karakter sayısı."
     block_common_passwords: "En çok kullanılan 10,000 parola arasında yer alan parolalara izin verme."
+    discourse_connect_url: "DiscourseConnect uç noktasının URL'si (http:// veya https:// içermelidir)"
+    discourse_connect_secret: "DiscourseConnect bilgilerini kriptografik olarak doğrulamak için kullanılan gizli string, 10 karakter veya daha uzun olduğundan emin olun"
     discourse_connect_overrides_bio: "Kullanıcı profilindeki kullanıcı biyografisini geçersiz kılar ve kullanıcının bunu değiştirmesini önler"
+    discourse_connect_overrides_groups: "Tüm manuel grup üyeliklerini gruplar özelliğinde belirtilen gruplarla senkronize et (UYARI: grup belirtmezseniz kullanıcı için tüm manuel grup üyelikleri silinecektir)"
+    discourse_connect_not_approved_url: "Onaylanmamış DiscourseConnect hesaplarını bu URL'ye yönlendir"
     enable_local_logins_via_email: "Kullanıcıların e-posta yoluyla kendilerine tek tıklamayla giriş bağlantısı gönderilmesini istemesine izin ver."
     allow_new_registrations: "Yeni kayıtlara izin ver. Yeni hesap oluşturulmasını engellemek için burayı işaretlemeyin."
     enable_signup_cta: "Geri dönen anonim kullanıcılara hesap oluşturmaları için bir uyarı göster."
@@ -1595,8 +1631,14 @@ tr_TR:
     selectable_avatars: "Kullanıcıların seçebileceği avatarların listesi."
     allow_all_attachments_for_group_messages: "Grup iletileri için tüm e-posta eklentilerine izin ver."
     png_to_jpg_quality: "Dönüştürülen JPG dosyasının kalitesi (1 en düşük kalite, 99 en iyi kalite, 100 devre dışı bırakmak için)."
+    image_preview_jpg_quality: "Yeniden boyutlandırılan görüntü dosyalarının kalitesi (1 en düşük kalite, 99 en iyi kalite, devre dışı bırakmak için 100)."
     allow_staff_to_upload_any_file_in_pm: "Yetkili üyelerin PM'de dosya yüklemesine izin ver."
     strip_image_metadata: "Şerit görüntü meta verileri."
+    composer_media_optimization_image_enabled: "Yüklenen görüntü dosyalarının istemci tarafı medya optimizasyonunu sağlar."
+    composer_media_optimization_image_bytes_optimization_threshold: "İstemci tarafı optimizasyonunu tetiklemek için minimum görüntü dosyası boyutu"
+    composer_media_optimization_image_resize_dimensions_threshold: "İstemci tarafında yeniden boyutlandırmayı tetiklemek için minimum imaj genişliği"
+    composer_media_optimization_image_resize_width_target: "Genişliği `composer_media_optimization_image_dimensions_resize_threshold` değerinden büyük olan resimler bu genişliğe göre yeniden boyutlandırılacaktır. `composer_media_optimization_image_dimensions_resize_threshold` değerinden büyük veya ona eşit olmalıdır."
+    composer_media_optimization_image_encode_quality: "Yeniden kodlama işleminde kullanılan JPEG kodlama kalitesi."
     min_ratio_to_crop: "Uzun görüntüleri kırpmak için kullanılan oran. Genişlik / yükseklik sonucunu girin."
     simultaneous_uploads: "Besteciye sürüklenip bırakılabilecek maksimum dosya sayısı"
     default_invitee_trust_level: "Davet edilen kullanıcılar için öntanımlı güven seviyesi (0-4)."
@@ -1692,6 +1734,7 @@ tr_TR:
     log_anonymizer_details: "Anonimleştirildikten sonra kullanıcının ayrıntılarını günlükte tutup tutmayacağı. GDPR'ye uyarken bunu kapatmanız gerekir."
     newuser_spam_host_threshold: "Yeni bir kullanıcı, `newuser_spam_host_threshold` gönderileri içerisinde aynı makineye, kaç kere bağlantı paylaşınca spam olarak algılansın."
     allowed_spam_host_domains: "Spam barındırma testinden hariç tutulan alan adı listesi. Yeni kullanıcıların, bu alan adlarına bağlantı içeren gönderi oluşturmaları hiç bir zaman engellenmeyecek."
+    staff_like_weight: "Personel beğenilerine ne kadar ağırlık verileceği (personel dışı beğenilerin ağırlığı 1'dir)"
     topic_view_duration_hours: "Her N saatte IP/Kullanıcı başına bir kez yeni konu görüntülemesi say"
     user_profile_view_duration_hours: "Her N saatte IP/Kullanıcı başına bir kez yeni profil görüntülemesi say"
     levenshtein_distance_spammer_emails: "İstenmeyen e-postaları eşleştirilirken, bulanık eşleşme için tahammül edilecek karakter sayısı farklılığı."
@@ -1708,6 +1751,7 @@ tr_TR:
     reviewable_claiming: "İncelenebilir içeriğin üzerinde işlem yapılabilmesi için hak talebinde bulunulması gerekiyor mu?"
     reviewable_default_topics: "Konuya göre gruplandırılmış incelenebilir içeriği varsayılan olarak göster"
     reviewable_default_visibility: "Bu önceliği karşılamadıkça incelenebilir öğeleri gösterme"
+    cooldown_hours_until_reflag: "Kullanıcıların bir gönderiyi yeniden işaretleyebilene kadar beklemek zorunda kalacakları süre"
     reply_by_email_enabled: "Konulara e-posta üzerinden cevap yazmayı etkinleştir."
     reply_by_email_address: "Email ile cevapla özelliği için gelen e-posta adresi şablonu, örnek: %%{reply_key}@reply.example.com or replies+%%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "E-posta adresleriyle gelen e-postaları yanıtlamak için alternatif şablonların listesi. Örnek:%%{reply_key}@reply.example.com |replies+%% {reply_key}@example.com"
@@ -1732,8 +1776,10 @@ tr_TR:
     hard_bounce_score: "Kalıcı bir geri sekme olduğunda kullanıcıya hemen geri sekme puanı eklenir."
     bounce_score_threshold: "Kullanıcıya e-posta gönderimi durdurmak için gereken en fazla geri seken posta sayısı"
     reset_bounce_score_after_days: "X gün sonra sekme puanını otomatik olarak sıfırlayın."
+    blocked_attachment_content_types: "İçerik türüne göre ekleri engellemek için kullanılan anahtar kelimelerin listesi."
     forwarded_emails_behaviour: "Discourse'a yönlendirilen bir e-posta nasıl ele alınır?"
     always_show_trimmed_content: "Her zaman gelen e-postaların kırpılmış bölümünü göster. UYARI: e-posta adreslerini gösterebilir."
+    trim_incoming_emails: "Gelen e-postaların alakalı olmayan kısmını kırp."
     private_email: "E-posta başlığına veya e-posta gövdesine gönderilerden veya konulardan içerik eklemeyin. NOT: ayrıca özet e-postaları devre dışı bırakır."
     post_excerpts_in_emails: "Bildirim e-postalarında her zaman tam yayınlar yerine alıntılar gönderin"
     raw_email_max_length: "Gelen e-posta için kaç karakter saklanması gerektiği."
@@ -1754,6 +1800,12 @@ tr_TR:
     email_in_min_trust: "Bir kullanıcının e-posta aracılığı ile yeni konu oluşturabilmesi için sahip olması gereken en az güven seviyesi."
     email_in_authserv_id: "Kimlik doğrulama yapan hizmetin tanımlayıcısı gelen e-postaları kontrol eder. Bunu yapılandırma talimatları için bkz. <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> ."
     email_in_spam_header: "Spam tespit etmek için e-posta başlığı."
+    enable_imap: "Grup mesajlarını senkronize etmek için IMAP'i etkinleştir."
+    enable_imap_idle: "Yeni e-postaları beklemek için IMAP IDLE mekanizmasını kullan."
+    enable_smtp: "Grup mesajları bildirimlerini göndermek için SMTP'yi etkinleştir."
+    imap_polling_period_mins: "E-postalar için IMAP hesaplarının kontrol edilmesi işlemleri arasındaki süre (dakika)."
+    imap_polling_old_emails: "Bir IMAP kutusu her sorgulandığında güncellenecek (işlenen) maksimum eski e-posta sayısı (tümü için 0)."
+    imap_polling_new_emails: "Bir IMAP kutusu her sorgulandığında güncellenecek maksimum yeni e-posta sayısı (işlenmemiş)."
     email_prefix: "E-postaların konu bölümünü belirten [etiket]. Boş bırakılırsa 'title' yazacak."
     email_site_title: "Bu siteden giden e-postalarda gönderici olarak kullanılacak sitenin başlığı. Herhangi bir şey girilmezse öntanımlı olarak 'title' yazacak. Eğer 'başlık\" içeriğinizde, e-posta göndericisinin stringlerinde izin verilmeyen karakterler varsa, bu ayarı kullanın. "
     find_related_post_with_key: "Yanıtlanan postayı bulmak için yalnızca 'cevap anahtarını' kullanın. UYARI: bunun devre dışı bırakılması, e-posta adresine göre kullanıcının kimliğine bürünülmesine olanak tanır."
@@ -1784,11 +1836,13 @@ tr_TR:
     staff_user_custom_fields: "API kullanan yetkililer için alınabilecek özel kullanıcı alanlarının listesi."
     enable_user_directory: "Göz atılabilmesi için kullanıcıların olduğu bir dizin sağla"
     enable_group_directory: "Tarama için bir grup dizini sağlayın"
+    enable_category_group_moderation: "Grupların belirli kategorilerdeki içeriği yönetmesine izin ver"
     group_in_subject: "PM'deki ilk grubun adına tabi e-postada %%{optional_pm} olarak ayarlayın, bkz: <a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>Standart e-postalar için konu biçimini özelleştirme</a>"
     allow_anonymous_posting: "Kullanıcıların anonim moda geçebilmelerine izin ver"
     anonymous_posting_min_trust_level: "Anonim gönderi oluşturabilmeyi etkinleştirebilmek için gereken en az güven seviyesi"
     anonymous_account_duration_minutes: "Anonimliği koruyabilmek için, her kulanıcı için her N dakikada bir yeni bir anonim hesap oluştur. Örnek: 600'e ayarlanırsa, son gönderi üzerinden 600 dakika geçer geçmez VE kullanıcı anonim moddaysa, yeni bir anonim hesap oluşturulur."
     hide_user_profiles_from_public: "Anonim kullanıcılar için kullanıcı kartlarını, kullanıcı profillerini ve kullanıcı dizinini devre dışı bırak"
+    allow_users_to_hide_profile: "Kullanıcıların profillerini ve durumlarını gizlemelerine izin ver"
     allow_featured_topic_on_user_profiles: "Kullanıcıların, kullanıcı kartlarında ve profillerinde bir konuya bağlantı sunmasına izin ver."
     show_inactive_accounts: "Oturum açan kullanıcıların etkin olmayan hesapların profillerine göz atmasına izin ver."
     hide_suspension_reasons: "Askıya alma nedenlerini kullanıcı profillerinde herkese açık olarak görüntülemeyin."
@@ -1831,9 +1885,11 @@ tr_TR:
     warn_reviving_old_topic_age: "Herhangi bir kullanıcı, son cevabın burada belirtilen gün sayısından daha önce yazıldığı bir konuya cevap yazmaya başladığında, bir uyarı iletisi çıkacak. Bu özelliği devre dışı bırakmak için 0 girin. "
     autohighlight_all_code: "Tüm önceden biçimlendirilen kod parçalarına, açıkça dil seçimi yapılmamış olsa da, zorla kod vurgulaması uygula."
     highlighted_languages: "Sözdizimi vurgulama kuralları dahil. (Uyarı: çok fazla dil dahil etmek performansı etkileyebilir) bkz: demo için <a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a>"
+    show_copy_button_on_codeblocks: "Blok içeriğini kullanıcının kopyalayabilmesi için kod bloklarına bir düğme ekle. Bu özellik Internet Explorer'da desteklenmez."
     embed_any_origin: "Kaynağı ne olursa olsun gömülebilir içeriğe izin ver. Bu, statik HTML'ye sahip mobil uygulamalar için gereklidir."
     embed_topics_list: "Konu listelerinin HTML yerleştirmesini destekleyin"
     embed_truncate: "Yerleştirilmiş gönderileri kırp."
+    embed_unlisted: "Bir kullanıcı yanıt verene kadar içe aktarılan konular listelenmez."
     embed_support_markdown: "Gömülü gönderiler için Markdown formatlama desteği."
     allowed_embed_selectors: "Gömme işlemlerinde izin verilen CSS öğelerinin virgülle ayrılmış listesi."
     allowed_href_schemes: "Http ve https'ye ek olarak bağlantılarda şemalara izin verilir."
@@ -1843,6 +1899,7 @@ tr_TR:
     show_create_topics_notice: "Eğer sitede herkese açık konu sayısı 5'den az ise, yöneticiden yeni konular oluşturmasını isteyen bir uyarı iletisi göster. "
     delete_drafts_older_than_n_days: "(n) günden eski taslakları sil."
     bootstrap_mode_min_users: "bootstrap modunun edilgen olması için gereken en az kullanıcı sayısı (edilgen bırakmak için 0 yapın)"
+    prevent_anons_from_downloading_files: "Anonim kullanıcıların ekleri indirmesini önle."
     slug_generation_method: "Slug üretim yöntemi seçin. 'kodlanmış' seçeneği yüzde kodlamalı metin oluşturur. 'hiçbiri' seçeneği slug'ı devre dışı bırakır."
     enable_emoji: "Emojiyi etkinleştir"
     enable_emoji_shortcuts: ":): p :( gibi yaygın gülen yüz ifadeleri emojilere dönüştürülecek"
@@ -1864,12 +1921,17 @@ tr_TR:
     new_user_notice_tl: "Yeni kullanıcıların gönderilerinin bildirimini görmek için gereken minimum güven seviyesi."
     returning_user_notice_tl: "Geri dönen kullanıcıların gönderilerinin bildirimini görmek için gereken minimum güven seviyesi."
     returning_users_days: "Bir kullanıcının geri döneceği düşünülmeden önce kaç gün geçmesi gerekir."
+    blur_tl0_flagged_posts_media: "Potansiyel NSFW (iş yeri için uygun olmayan) içeriğini gizlemek için işaretli (bayraklanmış) gönderilerin içindeki imajları bulanıklaştır."
+    enable_page_publishing: "Personelin, konuları kendi stilleriyle yeni URL'lerde yayınlamasına izin verin."
+    show_published_pages_login_required: "Oturum açma zorunlu olsa dahi anonim kullanıcılar yayınlanan sayfaları görebilir."
+    skip_auto_delete_reply_likes: "Eski yanıtları otomatik olarak silerken, bu sayıda veya daha fazla beğeniye sahip gönderileri silme."
     default_email_digest_frequency: "Öntanımlı olarak kullanıcılar ne sıklıkla e-posta özeti alacak."
     default_include_tl0_in_digests: "Yeni kullanıcılardan gelen gönderileri varsayılan olarak özet e-postalara dahil et. Kullanıcılar bunu kendi tercihlerine göre değiştirebilirler."
     default_email_level: "Normal konular için varsayılan e-posta bildirim seviyesini ayarlayın."
     default_email_messages_level: "Birisi kullanıcıya mesaj gönderdiğinde varsayılan e-posta bildirim seviyesini ayarlayın."
     default_email_mailing_list_mode: "Öntanımlı olarak her yeni gönderi için bir e-posta gönder."
     default_email_mailing_list_mode_frequency: "Posta listesi modunu etkinleştiren kullanıcılar varsayılan olarak bu e-postaları alır."
+    disable_mailing_list_mode: "Kullanıcıların posta listesi modunu etkinleştirmesine izin verme (posta listesi e-postalarının gönderilmesini engeller.)"
     default_email_previous_replies: "Varsayılan olarak e-postalara önceki yanıtları dahil et."
     default_email_in_reply_to: "Gönderilere gelen cevapların bir örneğini varsayılan olarak e-postaya ekle"
     default_other_new_topic_duration_minutes: "Konunun yeni olarak düşünülmesi için genel öntanımlı koşul."
@@ -1886,6 +1948,7 @@ tr_TR:
     default_categories_tracking: "Öntanımlı olarak, takip edilen kategorilerin listesi."
     default_categories_muted: "Öntanımlı olarak, sesi kısılan kategorilerin listesi."
     default_categories_watching_first_post: "Her yeni konudaki ilk gönderinin varsayılan olarak izleneceği kategori listesi."
+    default_categories_regular: "Varsayılan olarak sessize alınmayan kategorilerin listesi. `mute_all_categories_by_default` site ayarı etkinleştirildiğinde kullanışlıdır."
     mute_all_categories_by_default: "Sessize alınacak tüm kategorilerin varsayılan bildirim düzeyini ayarlayın. Kullanıcıların 'en son' ve 'kategoriler' sayfalarında görünmeleri için kategorilere katılmalarını isteyin. Anonim kullanıcılar için varsayılanları değiştirmek isterseniz 'default_categories_' ayarlarını yapın."
     default_tags_watching: "Varsayılan olarak izlenen etiketlerin listesi."
     default_tags_tracking: "Varsayılan olarak takip edilen etiketlerin listesi."
@@ -1922,10 +1985,18 @@ tr_TR:
     shared_drafts_category: "Konu taslakları için bir kategori belirleyerek Paylaşılan Taslaklar özelliğini etkinleştirin. Bu kategorideki konular, yetkili kullanıcılar için konu listelerinden kaldırılacaktır."
     shared_drafts_min_trust_level: "Kullanıcıların Paylaşılan Taslakları görmesine ve düzenlemesine izin verin."
     push_notifications_prompt: "Kullanıcı izni komut istemini görüntüle."
+    base_font: "Sitedeki çoğu metin için kullanılacak temel yazı tipi. Temalar, `--font-family` CSS özel özelliği aracılığıyla bunu geçersiz kılabilir."
+    heading_font: "Sitedeki çoğu başlık için kullanılacak temel yazı tipi. Temalar, `--heading-font-family` CSS özel özelliği aracılığıyla bunu geçersiz kılabilir."
     short_title: "Kısa başlık kullanıcının ana ekranında, başlatıcısında veya alanın sınırlı olabileceği diğer yerlerde kullanılır. En fazla 12 karakter olmalıdır."
+    dashboard_hidden_reports: "Gösterge tablosundan belirtilen raporların gizlenmesine izin verin."
     dashboard_visible_tabs: "Hangi pano sekmelerinin görünür olacağını seçin."
     dashboard_general_tab_activity_metrics: "Genel sekmesinde etkinlik ölçümleri olarak görüntülenecek raporları seçin."
     gravatar_name: "Gravatar sağlayıcısının adı"
+    gravatar_base_url: "Gravatar sağlayıcısının API URL'si"
+    gravatar_login_url: "Kullanıcı için Gravatar hizmetinde oturum açmayı sağlayan URL (gravatar_base_url'a göreceli olarak)"
+    share_quote_buttons: "Alıntı paylaşım widget'ında hangi öğelerin görüneceğini ve hangi sırayla görüneceklerini belirleyin."
+    share_quote_visibility: "Alıntı paylaşma düğmelerinin ne zaman gösterileceğini belirleyin: asla, yalnızca anonim kullanıcılara veya tüm kullanıcılara. "
+    create_revision_on_bulk_topic_moves: "Konular toplu olarak yeni bir kategoriye taşındığında ilk gönderiler için revizyon oluştur."
     errors:
       invalid_email: "Geçersiz e-posta adresi."
       invalid_username: "Bu kullanıcı adı ile bir kullanıcı bulunmuyor."
@@ -1954,12 +2025,15 @@ tr_TR:
       email_editable_enabled: "Bu ayarı etkinleştirmeden önce 'düzenlenebilir e-posta' yı devre dışı bırakmanız gerekir."
       staged_users_disabled: "Bu ayarı etkinleştirmeden önce 'staged users' etkinleştirmelisiniz."
       reply_by_email_disabled: "Bu ayarı etkinleştirmeden önce 'e-posta ile yanıtla' yı etkinleştirmelisiniz."
+      discourse_connect_url_is_empty: "Bu ayarı etkinleştirmeden önce bir 'discourse connect url' ayarlamanız gerekir."
+      discourse_connect_invite_only: "Aynı anda hem DiscourseConnect'i hem de 'sadece davet et'i etkinleştiremezsiniz."
       enable_local_logins_disabled: "Bu ayarı etkinleştirmeden önce 'yerel girişleri etkinleştir' seçeneğini etkinleştirmelisiniz."
       min_username_length_exists: "Minimum kullanıcı adı uzunluğunu en kısa kullanıcı adının (%{username}) üzerine ayarlayamazsınız."
       min_username_length_range: "En büyük değerin üstünde en küçük değer ayarlayamazsınız."
       max_username_length_exists: "Maksimum kullanıcı adı uzunluğunu en uzun kullanıcı adının (%{username}) altına ayarlayamazsınız."
       max_username_length_range: "En küçük değer altında en büyük değer ayarlayamazsınız."
       invalid_hex_value: "Renk değerleri 6 haneli onaltılık kodlar olmalıdır."
+      empty_selectable_avatars: "Bu ayarı etkinleştirmeden önce seçilebilir en az iki avatar yüklemelisiniz."
       category_search_priority:
         low_weight_invalid: "Ağırlığı 1 veya daha büyük olarak ayarlayamazsınız."
         high_weight_invalid: "Ağırlığı 1 veya daha küçük olarak ayarlayamazsınız."
@@ -1991,9 +2065,9 @@ tr_TR:
     no_email: "Hiçbir e-posta adresi verilmedi. Lütfen sitenin yöneticisine başvurun."
     blank_id_error: "`External_id` gerekli ancak boştu"
     email_error: "<b>%{email}</b> e-posta adresiyle bir hesap kaydedilemedi. Lütfen sitenin yöneticisine başvurun."
+    missing_secret: "Eksik gizli dize (secret) nedeniyle kimlik doğrulama başarısız oldu. Bu sorunu çözmek için site yöneticileriyle iletişime geçin."
     invite_redeem_failed: "Davet kullanımı başarısız oldu. Lütfen site yöneticisi ile iletişime geçin."
   original_poster: "Özgün Gönderici"
-  most_posts: "En Çok Gönderi"
   most_recent_poster: "En Son Gönderen"
   frequent_poster: "En Sık Gönderen"
   poster_description_joiner: ", "
@@ -2076,6 +2150,7 @@ tr_TR:
     auto_deleted_by_timer: "Zamanlayıcı tarafından otomatik olarak silinir."
   login:
     invalid_second_factor_method: "Seçilen iki faktör yöntemi geçersiz."
+    not_enabled_second_factor_method: "Seçilen iki faktörlü yöntem hesabınız için etkinleştirilmemiş."
     security_key_description: "Fiziksel güvenlik anahtarınızı hazırladığınızda, aşağıdaki Güvenlik Anahtarıyla Kimlik Doğrula düğmesine basın."
     security_key_alternative: "Başka bir yol dene"
     security_key_authenticate: "Güvenlik Anahtarı ile Kimlik Doğrulama"
@@ -2092,6 +2167,7 @@ tr_TR:
     not_activated: "Henüz giriş yapamazsınız. Size bir etkinleştirme e-postası gönderdik. Hesabınızı etkinleştirmek için lütfen e-postadaki yönlendirmeleri takip edin."
     not_allowed_from_ip_address: "Bu IP adresinden %{username} kullanıcı adı ile giriş yapamazsınız."
     admin_not_allowed_from_ip_address: "Bu IP adresinden admin olarak giriş yapamazsınız."
+    reset_not_allowed_from_ip_address: "Bu IP adresinden parola sıfırlama talebinde bulunamazsınız."
     suspended: "%{date} tarihine kadar giriş yapamazsınız."
     suspended_with_reason: "Hesap %{date} tarihine kadar askıya alınmıştır. Sebep: %{reason}"
     errors: "%{errors}"
@@ -2102,6 +2178,7 @@ tr_TR:
       csrf_detected: "Yetkilendirme zaman aşımına uğradı veya tarayıcıları değiştirdiniz. Lütfen tekrar deneyin."
       request_error: "Yetkilendirme başlatılırken bir hata oluştu. Lütfen tekrar deneyin."
       invalid_iat: "Sunucu saati farklılıkları nedeniyle yetkilendirme belirteci doğrulanamıyor. Lütfen tekrar deneyin."
+    omniauth_error_unknown: "Oturum açma işleminiz gerçekleştirilirken bir şeyler ters gitti, lütfen tekrar deneyin."
     omniauth_confirm_title: "%{provider} kullanarak giriş yapın"
     omniauth_confirm_button: "Devam et"
     authenticator_error_no_valid_email: "%{account} ile ilişkili hiçbir e-posta adresine izin verilmiyor. Hesabınızı farklı bir e-posta adresiyle yapılandırmanız gerekebilir."
@@ -2117,6 +2194,7 @@ tr_TR:
     second_factor_title: "İki Faktörlü Kimlik Doğrulama"
     second_factor_description: "Lütfen uygulamanıza gerekli kimlik doğrulama kodunu girin:"
     second_factor_backup_description: "Lütfen yedek kodlarından birini gir:"
+    second_factor_backup_title: "İki Faktörlü Oturum Açma Yedekleme Kodu"
     invalid_second_factor_code: "Geçersiz kimlik doğrulama kodu. Her kod yalnızca bir kez kullanılabilir."
     invalid_security_key: "Geçersiz güvenlik anahtarı."
     missing_second_factor_name: "Lütfen bir isim belirtin."
@@ -2130,9 +2208,13 @@ tr_TR:
     user:
       merge_user:
         updating_username: "Kullanıcı adı güncelleniyor..."
+        changing_post_ownership: "Gönderi sahipliği değiştiriliyor..."
+        merging_given_daily_likes: "Verilen günlük beğeniler birleştiriliyor..."
         merging_post_timings: "Gönderi zamanlamaları birleştiriliyor..."
         merging_user_visits: "Kullanıcı ziyaretleri birleştiriliyor..."
+        updating_site_settings: "Site ayarları güncelleniyor..."
         updating_user_stats: "Kullanıcı istatistikleri güncelleniyor..."
+        merging_user_attributes: "Kullanıcı özellikleri birleştiriliyor..."
         updating_user_ids: "Kullanıcı IDleri güncelleniyor..."
         deleting_source_user: "Kaynak kullanıcı siliniyor..."
   user:
@@ -2143,6 +2225,7 @@ tr_TR:
       other: "%{count} gün işlem yapılmazsa otomatik olarak devre dışı bırakılır"
     activated_by_staff: "Yetkili tarafından etkinleştirildi"
     new_user_typed_too_fast: "Yeni kullanıcı çok hızlı yazmış"
+    content_matches_auto_silence_regex: "İçerik, otomatik sessize alma regexi ile eşleşiyor"
     content_matches_auto_block_regex: "Otomatik blok regex içerik ifadesiyle eşleşiyor"
     username:
       short: "en az %{min} karakter olmalı"
@@ -2172,6 +2255,8 @@ tr_TR:
       fixed_primary_email: "Aşamalı kullanıcı için birincil e-posta düzeltildi"
       same_ip_address: "Diğer kullanıcılarla aynı IP adresi (%{ip_address})"
       inactive_user: "Etkin olmayan kullanıcı"
+      reviewable_reject_auto: "Kuyruğa alınan gözden geçirilebilir öğeleri otomatik olarak işle"
+      reviewable_reject: "İncelenebilir kullanıcı reddedildi"
     email_in_spam_header: "Kullanıcının ilk e-postası spam olarak işaretlendi"
     already_silenced: "Kullanıcı zaten %{staff} tarafından %{time_ago} susturuldu."
     already_suspended: "Kullanıcı zaten %{staff} tarafından %{time_ago} askıya alındı."
@@ -2277,35 +2362,9 @@ tr_TR:
   new_version_mailer:
     title: "Yeni Sürüm Posta Göndericisi"
     subject_template: "[%{email_prefix}] Yeni Discourse sürümü, güncelleme var"
-    text_body_template: |
-      Yuhaaa, [Discourse](http://www.discourse.org) için yeni bir sürüm hazır!
-
-      Sizin sürümünüz:  %{installed_version}
-      Yeni çıkan sürüm: **%{new_version}**
-
-      - **[Tek tıklamayla](%{base_url}/admin/upgrade)** basitçe yükseltin
-
-      - Nelerin yeni olduğunu [GitHub kayıtlarında](https://github.com/discourse/discourse/commits/master) ve [Yayınlanmış Notlarda] (https://meta.discourse.org/tags/release-notes) görün
-
-      - Yeniliklerden haberdar olmak, tartışmak ve destek almak için [meta.discourse.org](https://meta.discourse.org) adresini ziyaret edin
   new_version_mailer_with_notes:
     title: "Yeni Sürüm Notlarla beraber Posta Göndericisi "
     subject_template: "[%{email_prefix}] güncelleme mevcut"
-    text_body_template: |
-      Yuhaaa, [Discourse](http://www.discourse.org) için yeni bir sürüm hazır!
-
-      Sizin sürümünüz:  %{installed_version}
-      Yeni çıkan sürüm: **%{new_version}**
-
-      - **[Tek tıklamayla](%{base_url}/admin/upgrade)** basitçe yükseltin
-
-      - Nelerin yeni olduğunu [GitHub kayıtlarında](https://github.com/discourse/discourse/commits/master) ve [Yayınlanmış Notlarda] (https://meta.discourse.org/tags/release-notes) görün
-
-      - Yeniliklerden haberdar olmak, tartışmak ve destek almak için [meta.discourse.org](https://meta.discourse.org) adresini ziyaret edin
-
-      ###Yayınlanmış Notlar
-
-      %{notes}
   flag_reasons:
     off_topic: "Gönderiniz **konu-dışı** olarak bildirildi: topluluk, gönderinizin konu başlığı ve ilk gönderi ile tanımlanan konu içeriğine uygun olmadığını düşünüyor. "
     inappropriate: "Gönderiniz **uygunsuz** olarak bildirildi: topluluk gönderinizin saldırgan, kaba ya da [topluluk yönergelerine](%{base_path}/guidelines) aykırı olduğunu düşünüyor."
@@ -2386,6 +2445,20 @@ tr_TR:
     flags_agreed_and_post_deleted:
       title: "Raporlanmış gönderi personel tarafından kaldırıldı"
       subject_template: "Raporlanmış gönderi personel tarafından kaldırıldı"
+      text_body_template: |
+        Merhaba,
+
+        Bu %{site_name} tarafından [gönderinizin](%{base_url}%{url}) kaldırıldığını bildirmek için gönderilen otomatik bir mesajdır.
+
+        %{flag_reason}
+
+        Bu gönderi topluluk tarafından işaretlendi/bayraklandı ve bir personel bunu kaldırmayı uygun gördü.
+
+        ``` markdown
+        %{flagged_post_raw_content}
+        ```
+
+        Ayrıntılar için lütfen [topluluk yönergelerimizi](%{base_url}/guidelines) inceleyin.
     usage_tips:
       text_body_template: |
         Yeni bir kullanıcı olarak başlamak için birkaç küçük ipucu,[bu blog gönderisini inceleyin](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
@@ -2651,6 +2724,18 @@ tr_TR:
     email_reject_bad_destination_address:
       title: "E-posta Reddedildi Sorunlu Alıcı Adresi"
       subject_template: "[%{email_prefix}] E-posta sorunu - Bilinmeyen: Adres"
+      text_body_template: |
+        Üzgünüz, %{destination} hedefli (%{former_title} başlıklı) e-posta mesajı iletilmedi.
+
+        Şunları kontrol etmeniz iyi olabilir:
+
+          - Birden fazla e-posta adresi mi kullanıyorsunuz? Başlangıçta kullandığınızdan farklı bir e-posta adresinden mi yanıt verdiniz? E-posta yanıtları, aynı e-posta adresini kullanmanızı gerektirir.
+
+          - E-posta yazılımınız yanıtlarken Reply-To: e-posta adresini düzgün bir şekilde kullandı mı? Ne yazık ki, bazı e-posta yazılımları, yanıtı yanlış bir şekilde From: adresine gönderir, ki bu çalışmaz.
+
+          - E-postadaki Message-ID header bilgisi değiştirildi mi? Message-ID tutarlı ve değiştirilmemiş olmalıdır.
+
+        Daha fazla yardıma ihtiyacınız varsa %{base_url}/about adresindeki bilgileri kullanarak bize ulaşın
     email_reject_old_destination:
       title: "E-posta Reddedildi Eski Gönderim Yeri"
       subject_template: "[%{email_prefix}] E-posta sorunu - Eski bir bildirimi yanıtlamaya çalışıyorsunuz"
@@ -2697,6 +2782,14 @@ tr_TR:
         Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız e-posta başarısız oldu.
 
         Konuyu cevaplamak için gerekli izniniz yok. Yanlışlık olduğunu düşünüyorsanız, [bir görevli ile iletişime geçin](%{base_url}/about).
+    email_reject_reply_to_digest:
+      subject_template: "[%{email_prefix}] E-posta sorunu -- Özete Yanıt"
+      text_body_template: |
+        Üzgünüz ancak %{destination}'a ilettiğiniz (%{former_title} başlıklı) e-posta mesajı gitmedi.
+
+        Bir özet e-postasını yanıtladınız, ki bu yapılamaz.
+
+        Bunun yanlışlıkla olduğunu düşünüyorsanız, [bir personelle iletişime geçin](%{base_url}/hakkında).
     email_error_notification:
       title: "E-posta Hata Bildirimi"
       subject_template: "[%{email_prefix}] E-posta sorunu - POP kimlik doğrulama hatası"
@@ -2765,6 +2858,14 @@ tr_TR:
     spam_post_blocked:
       title: "Spam Gönderi Bloklandı"
       subject_template: "Üst üste aynı bağlantıların paylaşılmasından ötürü %{username} adlı yeni kullanıcının gönderileri engelledi"
+      text_body_template: |
+        Bu bir otomatik mesajdır.
+
+        Yeni kullanıcı [%{username}](%{user_url}) %{domains} ile bağlantılı birden çok gönderi oluşturmaya çalıştı ancak bu gönderiler spamı önlemek için engellendi. Kullanıcı %{domains} ile bağlantılı olmayan yeni gönderiler oluşturabilir.
+
+        Lütfen [kullanıcıyı gözden geçirin](%{user_url}).
+
+        Bu davranış `newuser_spam_host_threshold` ve `white_listed_spam_host_domains` site ayarlarından değiştirilebilir. Eğer muaf tutmak gerekiyorsa %{domains}'i izin verilenler listesine ekleyebilirsiniz.
     unsilenced:
       title: "Susturulmamış"
       subject_template: "Hesap artık askıda değil"
@@ -3039,9 +3140,23 @@ tr_TR:
     account_suspended:
       title: "Hesap Askıya Alındı"
       subject_template: "[%{email_prefix}] Hesabınız askıya alındı"
+      text_body_template: |
+        Forumda %{suspended_till} tarihine kadar askıya alındınız.
+
+        Gerekçe - %{reason}
+    account_suspended_forever:
+      title: "Hesap Askıya Alındı"
+      subject_template: "[%{email_prefix}] Hesabınız askıya alındı"
     account_silenced:
       title: "Hesap Susturuldu"
       subject_template: "[%{email_prefix}] Hesabınız susturuldu"
+      text_body_template: |
+        Forumda %{silenced_till} tarihine kadar susturuldunuz.
+
+        Gerekçe - %{reason}
+    account_silenced_forever:
+      title: "Hesap Susturuldu"
+      subject_template: "[%{email_prefix}] Hesabınız susturuldu"
     account_exists:
       title: "Bu Hesap Zaten Mevcut"
       subject_template: "[%{email_prefix}] Hesap zaten mevcut"
@@ -3056,11 +3171,18 @@ tr_TR:
     account_second_factor_disabled:
       title: "İki Faktörlü Kimlik Doğrulama devre dışı bırakıldı"
       subject_template: "[%{email_prefix}] İki Faktörlü Kimlik Doğrulaması devre dışı"
+      text_body_template: |
+        %{site_name} sitesindeki hesabınızın iki adımlı kimlik doğrulaması devre dışı bırakıldı. Şu an sadece şifreniz ile giriş yapabilirsiniz. Ek olarak iki adımlı kimlik doğrulaması yapmanız artık gerekmeyecek.
+
+        Eğer iki adımlı kimlik doğrulamayı siz iptal etmediyseniz birisi hesabınızın güvenliğini ihlal etmiş olabilir.
+
+        Herhangi bir sorunuz varsa [görevlilerimiz ile iletişime geçin](%{base_url}/about).
     digest:
       why: "%{last_seen_at} tarihindeki son girişinizden beri %{site_link} sitesine olanların kısa bir özeti"
       since_last_visit: "Son ziyaretinizden bu yana"
       new_topics: "Yeni Konular"
       unread_notifications: "Okunmamış Bildirimler"
+      unread_high_priority: "Okunmamış Yüksek Öncelikli Bildirimler"
       liked_received: "Alınan Beğeniler"
       new_users: "Yeni Kullanıcılar"
       popular_topics: "Gözde Konular"
@@ -3101,6 +3223,7 @@ tr_TR:
     admin_login:
       title: "Yönetici Girişi"
       subject_template: "[%{email_prefix}] Giriş"
+      text_body_template: "Birisi [%{site_name}] (%{base_url}) adresinde hesabınıza giriş yapmak istedi. \n\nBu isteği siz yapmadıysanız, bu e-postayı güvenle yok sayabilirsiniz. \n\nGiriş yapmak için aşağıdaki bağlantıyı tıklayın:\n %{base_url}/session/email-login/%{email_token}\n"
     account_created:
       title: "Hesap oluşturuldu"
       subject_template: "[%{email_prefix}] Yeni Hesabınız"
@@ -3112,9 +3235,21 @@ tr_TR:
     confirm_new_email:
       title: "Yeni E-postayı Onayla"
       subject_template: "[%{email_prefix}] Yeni e-posta adresinizi onaylayın"
+      text_body_template: |
+        Aşağıdaki bağlantıya tıklayarak %{site_name} için yeni e-posta adresinizi onaylayın:
+
+        %{base_url}/u/confirm-new-email/%{email_token}
+
+        Bu değişikliği siz talep etmediyseniz, lütfen bir [site yöneticisi](%{base_url}/about) ile iletişime geçin.
     confirm_new_email_via_admin:
       title: "Yeni E-postayı Onayla"
       subject_template: "[%{email_prefix}] Yeni e-posta adresinizi onaylayın"
+      text_body_template: |
+        Aşağıdaki bağlantıya tıklayarak %{site_name} için yeni e-posta adresinizi onaylayın:
+
+        %{base_url}/u/confirm-new-email/%{email_token}
+
+        Bu e-posta değişikliği bir site yöneticisi tarafından istendi. Bu değişikliği talep etmediyseniz, lütfen bir [site yöneticisi](%{base_url}/about) ile iletişime geçin.
     confirm_old_email:
       title: "Eski E-postayı Onayla"
       subject_template: "[%{email_prefix}] Mevcut e-posta adresinizi onaylayın"
@@ -3122,6 +3257,7 @@ tr_TR:
     confirm_old_email_add:
       title: "Eski E-postayı Onayla (Ekle)"
       subject_template: "[%{email_prefix}] Mevcut e-posta adresinizi onaylayın"
+      text_body_template: "Yeni bir e-posta adresi ekleyebilmemiz için mevcut e-posta hesabını kontrol ettiğinizi onaylamanız gerekiyor. Bu adımı tamamladıktan sonra yeni e-posta adresini onaylamanızı isteyeceğiz. \n\nAşağıdaki bağlantıya tıklayarak %{site_name} için mevcut e-posta adresinizi onaylayın: \n\n%{base_url}/u/confirm-old-email/%{email_token}\n"
     notify_old_email:
       title: "Eski E-postayı Bildir"
       subject_template: "[%{email_prefix}] E-posta adresiniz değiştirildi"
@@ -3132,12 +3268,22 @@ tr_TR:
 
         E-posta adresiniz şu e-posta ile değiştirildi:
 
+        %{new_email}
+    notify_old_email_add:
+      title: "Eski E-postaya Bildir (Ekle)"
+      subject_template: "[%{email_prefix}] Yeni bir e-posta adresi eklendi"
+      text_body_template: |
+        Bu, %{site_name} sitesine bir e-posta adresinin eklendiğini bildirmek için gönderilen otomatik bir mesajdır. Bir yanlışlık olduğunu düşünüyorsanız, lütfen site yöneticisine başvurun.
+
+        Eklediğiniz e-posta adresi:
+
         %{new_email}
     signup_after_approval:
       title: "Onay Sonrası Kayıt"
       subject_template: "%{site_name} sitesinde hesabınız onaylandı!"
       text_body_template: "%{site_name}&#39;a hoş geldiniz! \nBir moderatör hesabınızı %{site_name} \n\nadresinde onayladı. Artık yeni hesabınıza şu adresten giriş yaparak erişebilirsiniz: %{base_url} \n\nYukarıdaki bağlantı tıklanabilir değilse, kopyalayıp web tarayıcınızın adres çubuğuna yapıştırmayı deneyin. \n\n%{new_user_tips} \n\nHer zaman [medeni topluluk davranışına] (%{base_url} / yönergeleri) kontrolünü sağlıyoruz. \n\nKeyfini çıkarın!\n"
     signup_after_reject:
+      title: "Red Sonrası Kayıt"
       subject_template: "%{site_name} hesabınız reddedildi"
       text_body_template: |
         Bir ekip üyesi, %{site_name} hesabınızı reddetti.
@@ -3192,6 +3338,7 @@ tr_TR:
     file_missing: "Affedersiniz, yükleme için bir dosya sağlamalısınız."
     empty: "Üzgünüz, sağladığınız dosya boş."
     png_to_jpg_conversion_failure_message: "PNG'den JPG'ye dönüştürülürken bir hata oluştu."
+    optimize_failure_message: "Yüklenen imaj optimize edilirken bir hata oluştu."
     attachments:
       too_large: "Üzgünüz, yüklemeye çalıştığınız dosya çok büyük (en fazla %{max_size_kb}KB olabilir)."
     images:
@@ -3274,7 +3421,9 @@ tr_TR:
     mass_award:
       errors:
         invalid_csv: '%{line_number} satırında bir hatayla karşılaştık. Lütfen CSV''nin her satırında bir e-posta olduğunu doğrulayın.'
+        too_many_csv_entries: CSV dosyasında çok fazla giriş var. %{count} adetten çok giriş içermeyen bir CSV dosyası seçiniz.
         badge_disabled: Lütfen önce %{badge_name} rozetini etkinleştirin.
+        cant_grant_multiple_times: '%{badge_name} rozeti bir kullanıcıya birden çok kez verilemez.'
     editor:
       name: Düzenleyici
       description: İlk gönderini düzenledin
@@ -3544,6 +3693,9 @@ tr_TR:
         other: '"%{tag_name}" aşağıdaki kategorilerle sınırlıdır: %{category_names}'
       synonym: 'Eş anlamlılara izin verilmiyor. Bunun yerine "%{tag_name}" kullanın.'
       has_synonyms: '"%{tag_name}" kullanılamıyor çünkü eş anlamlıları var.'
+    required_tags_from_group:
+      one: "En az %{count} %{tag_group_name} etiketi eklemelisiniz. Bu gruptaki etiketler şunlardır: %{tags}."
+      other: "En az %{count} %{tag_group_name} etiketi eklemelisiniz. Bu gruptaki etiketler şunlardır: %{tags}."
     invalid_target_tag: "eşanlamlı eşanlamlı olamaz"
     synonyms_exist: "eş anlamlılar varken izin verilmiyor"
   rss_by_tag: "%{tag} etiketli konular"
@@ -3597,6 +3749,7 @@ tr_TR:
             label: "Hoş geldiniz Konusu"
             description: "<p> Topluluğunuzu yaklaşık 1 dakika içinde bir asansördeki bir yabancıya nasıl tarif edersiniz? </p><ul><li> Bu tartışmalar kimler içindir? </li><li> Burada ne bulabilirim? </li><li> Neden ziyaret etmeliyim? </li></ul><p> Hoşgeldiniz konunuz, yeni gelenlerin okuyacağı ilk şeydir. Bunu <b>bir paragraf</b> “asansör konuşması” veya “görev beyanı” olarak düşünün. </p>"
             one_paragraph: "Lütfen hoş geldiniz iletinizi bir paragraf kadar uzunlukta tutun."
+            extra_description: "Emin değilseniz, bu adımı atlayabilir ve karşılama içeriğinizi daha sonra düzenleyebilirsiniz."
       privacy:
         title: "Erişim"
         description: "<p>Topluluğunuz herkese açık mı, yoksa üyelik, davet veya onay ile kısıtlanmış mı? İsterseniz, işleri özel olarak ayarlayabilir ve daha sonra herkese açık hale getirebilirsiniz.</p> "
@@ -3700,6 +3853,10 @@ tr_TR:
         disabled: "Yerel girişler devre dışı bırakıldığından, kimseye davet göndermek mümkün değildir. Lütfen bir sonraki adıma geçin."
       finished:
         title: "Discourse'unuz hazır! "
+        description: |
+          <p>Bu ayarları değiştirmek isterseniz, <b>bu sihirbazı istediğiniz zaman yeniden çalıştırın</b> ya da <a href='%{base_path}/admin' target='_blank'>yönetici bölümünü</a> ziyaret edin; oraya, site menüsündeki İngiliz anahtarı simgesiyle gidebilirsiniz.</p>
+          <p>Güçlü tema sistemimizi kullanarak Discourse kurulumunuzu daha da özelleştirmek çok kolaydır. Örnekler için, <a href="https://meta.discourse.org/" target="_blank">meta.discourse.org</a> adresinden <a href="https://meta.discourse.org/c/theme/61/l/top" target="_blank">tema ve bileşenlere</a> göz atın.</p>
+          <p><a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>Yeni topluluğunuzu oluştururken</a> iyi eğlenceler ve iyi şanslar!</p>
   search_logs:
     graph_title: "Arama Sayısı"
   joined: "Katıldı"
@@ -3729,6 +3886,7 @@ tr_TR:
       revoked: İptal edilmiş
       restored: Restore edildi
   reviewables:
+    already_handled: "Teşekkürler, ancak bu gönderiyi daha önce inceledik ve yeniden işaretlenmesi gerekmediğine karar verdik."
     already_handled_and_user_not_exist: "Teşekkürler, ancak birisi daha önce gözden geçirdi ve bu kullanıcı artık mevcut değil."
     priorities:
       low: "Düşük"
@@ -3749,12 +3907,15 @@ tr_TR:
       new_topics_unless_trust_level: "Güven seviyesi düşük olan kullanıcılar, görevli tarafından onaylanmış konulara sahip olmalıdır. Bkz. “approve_new_topics_unless_trust_level`."
       fast_typer: "Yeni kullanıcı ilk gönderilerini şüpheli biçimde hızlı yazdı, şüpheli bot veya spam gönderici davranışları. Bkz. “min_first_post_typing_time”."
       auto_silence_regexp: "İlk gönderisi \"auto_silence_first_post_regex\" ayarıyla eşleşen yeni kullanıcı."
+      watched_word: "Bu gönderi bir İzlenen Kelime içeriyordu. <a href='%{base_url}/admin/customize/watched_words'>İzlenen kelime listeniz</a>."
       staged: "Aşama kaydetmiş kullanıcılar için yeni konular ve gönderiler moderatör tarafından onaylanmalıdır. Bkz: `approve_unless_staged`."
       category: "Bu kategorideki gönderiler, moderatör tarafından manuel onay gerektirir. Kategori ayarlarına bakın."
       must_approve_users: "Tüm yeni kullanıcılar yetkili tarafından onaylanmalıdır. Bkz. “must_approve_users`."
       invite_only: "Tüm yeni kullanıcılar davet edilmelidir. Bkz.`invite_only`"
       email_auth_res_enqueue: "Bu e-posta DMARC kontrolünde başarısız oldu, büyük olasılıkla kimden geldiği belli değil. Daha fazla bilgi için satır e-posta başlıklarına bakın."
       email_spam: "Bu e-posta, 'email_in_spam_header' içinde tanımlanan başlık tarafından spam olarak işaretlendi."
+      suspect_user: "Bu yeni kullanıcı, herhangi bir konuyu veya gönderiyi okumadan profil bilgilerini girdi, bu da büyük ihtimalle spam gönderici olabileceklerini gösteriyor. Bkz. `approve_suspect_users`"
+      contains_media: "Bu yazı gömülü medya içerir. Bkz. `review_media_unless_trust_level`."
       queued_by_staff: "Bir görevli bu gönderinin incelenmesi gerektiğini düşünüyor. Bu yapılana kadar gizlenmiş halde kalacak."
     actions:
       agree:
@@ -3841,6 +4002,16 @@ tr_TR:
     mute_error: "Üzgünüz, o kullanıcıyı sessize alamazsınız."
   discord:
     not_in_allowed_guild: "Kimlik doğrulama başarısız oldu. İzin verilen bir Discord guildinin üyesi değilsiniz."
+  old_keys_reminder:
+    title: "Kimlik bilgilerinin değiştirilmesi anımsatıcısı"
+    body: |
+      Merhaba! Bu, Discourse kurulumunuzdan gelen rutin bir yıllık güvenlik hatırlatıcısıdır.
+
+      Discourse kurulumunuzda kullanılan aşağıdaki kimlik bilgilerinin iki yıldan fazla süredir güncellenmediğini size bildirmek istedik:
+
+      %{keys}
+
+      Herhangi bir işlem yapmanız şart değil, ancak tüm önemli kimlik bilgilerinizi birkaç yılda bir değiştirmek iyi bir güvenlik uygulamasıdır.
   create_linked_topic:
     topic_title_with_sequence:
       one: "%{topic_title} (Bölüm %{count})"
diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml
index d91fe7c25b..d209a4134e 100644
--- a/config/locales/server.uk.yml
+++ b/config/locales/server.uk.yml
@@ -2070,7 +2070,6 @@ uk:
     no_email: "Не вказано електронну адресу e-mail. Зверніться до адміністратора сайту."
     email_error: "Не вдалося зареєструвати обліковий запис з електронною поштою <b>%{email}</b>. Зверніться до адміністратора сайту."
   original_poster: "Перший дописувач"
-  most_posts: "Найбільше дописів"
   most_recent_poster: "Автор останнього допису"
   frequent_poster: "Частий дописувач"
   redirected_to_top_reasons:
@@ -2674,9 +2673,15 @@ uk:
     account_suspended:
       title: "Акаунт призупинено"
       subject_template: "[%{email_prefix}] Ваш обліковий запис призупинено"
+    account_suspended_forever:
+      title: "Акаунт призупинено"
+      subject_template: "[%{email_prefix}] Ваш обліковий запис призупинено"
     account_silenced:
       title: "Обліковий запис вимкнено"
       subject_template: "[%{email_prefix}] Ваш обліковий запис вимкнено"
+    account_silenced_forever:
+      title: "Обліковий запис вимкнено"
+      subject_template: "[%{email_prefix}] Ваш обліковий запис вимкнено"
     account_exists:
       title: "Обліковий запис вже існує"
       subject_template: "[%{email_prefix}] Обліковий запис вже існує"
diff --git a/config/locales/server.ur.yml b/config/locales/server.ur.yml
index 9f44bd0964..4ffb9da512 100644
--- a/config/locales/server.ur.yml
+++ b/config/locales/server.ur.yml
@@ -1737,7 +1737,6 @@ ur:
     no_email: "کوئی ای میل پتہ فراہم نہیں گیا تھا۔ براہ مہربانی سائٹ کے ایڈمِنِسٹریٹر سے رابطہ کریں۔"
     email_error: "%{email} ای میل ایڈریس کے ساتھ اکاؤنٹ رجسٹر نہیں کیا جا سکا ۔ براہ مہربانی سائٹ کے ایڈمِنِسٹریٹر سے رابطہ کریں۔"
   original_poster: "اصل پوسٹ کرنے والا"
-  most_posts: "سب سے زیادہ پوسٹس"
   most_recent_poster: "سب سے حالیہ پوسٹ کرنے والا"
   frequent_poster: "اکثر پوسٹ کرنے والا"
   redirected_to_top_reasons:
@@ -2680,9 +2679,15 @@ ur:
     account_suspended:
       title: "اکاؤنٹ معطل"
       subject_template: "[%{email_prefix}] آپ کا اکاؤنٹ معطل کر دیا گیا ہے"
+    account_suspended_forever:
+      title: "اکاؤنٹ معطل"
+      subject_template: "[%{email_prefix}] آپ کا اکاؤنٹ معطل کر دیا گیا ہے"
     account_silenced:
       title: "اکاؤنٹ خاموش"
       subject_template: "[%{email_prefix}] آپ کا اکاؤنٹ خاموش کر دیا گیا ہے"
+    account_silenced_forever:
+      title: "اکاؤنٹ خاموش"
+      subject_template: "[%{email_prefix}] آپ کا اکاؤنٹ خاموش کر دیا گیا ہے"
     account_exists:
       title: "اکاؤنٹ پہلے سے موجود"
       subject_template: "[%{email_prefix}] اکاؤنٹ پہلے سے ہی موجود ہے"
diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml
index 4156ebb355..01d73d218b 100644
--- a/config/locales/server.vi.yml
+++ b/config/locales/server.vi.yml
@@ -1200,7 +1200,6 @@ vi:
     unknown_error: "Đã có vấn đề xảy ra với tài khoản của bạn, xin hãy liên hệ với BQT."
     timeout_expired: "Đăng nhập tài khoản hết hạn, xin hãy thử đăng nhập lại."
   original_poster: "Người viết gốc"
-  most_posts: "Bài viết Phỏ biến"
   most_recent_poster: "Người Gửi Mới Đây"
   frequent_poster: "Người Gửi Thường Xuyên"
   redirected_to_top_reasons:
@@ -1393,35 +1392,8 @@ vi:
       Chúng tôi đã gửi liên kết tải xuống này đến địa chỉ email đã được xác thực của bạn vì lý do bảo mật.
 
       (Nếu bạn *không* yêu cầu tải xuống này, bạn nên thực sự lo lắng - ai đó có quyền truy cập quản trị vào trang web của bạn.)
-  new_version_mailer:
-    text_body_template: |
-      Hoan hô, đã có phiên bản mới của [Discourse](https://www.discourse.org)!
-
-      Phiên bản của bạn: %{installed_version}
-      Phiên bản mới: **%{new_version}**
-
-      - Nâng cấp dễ dàng bằng cách sử dụng ** [nâng cấp trình duyệt bằng một cú nhấp chuột] (%{base_url}/admin/upgrade) **
-
-      - Xem có gì mới trong [ghi chú phát hành](https://meta.discourse.org/tag/release-notes) hoặc xem [bản thay đổi thô của GitHub](https://github.com/discourse/discourse/commits/master)
-
-      - Truy cập [meta.discourse.org](https://meta.discourse.org) để biết tin tức, thảo luận và hỗ trợ cho Discourse
   new_version_mailer_with_notes:
     subject_template: "[%{email_prefix}] có bản cập nhật"
-    text_body_template: |
-      Hoan hô, đã có phiên bản mới của [Discourse](https://www.discourse.org)
-
-      Phiên bản của bạn: %{installed_version}
-      Phiên bản mới: **%{new_version}**
-
-      - Nâng cấp bằng cách sử dụng dễ dàng **[nâng cấp trình duyệt bằng một cú nhấp chuột](%{base_url}/admin/upgrade)**
-
-      - Xem có gì mới trong [ghi chú phát hành](https://meta.discourse.org/tag/release-notes) hoặc xem [bản thay đổi thô của GitHub](https://github.com/discourse/discourse/commits/master)
-
-      - Truy cập [meta.discourse.org](https://meta.discourse.org) để biết tin tức, thảo luận và hỗ trợ cho Discourse
-
-      ### Ghi chú phát hành
-
-      %{notes}
   flag_reasons:
     off_topic: "Bài viết của bạn được đánh dấu là **off-topic**: cộng đồng cảm thấy nó không phù hợp cho chủ đề này, được xác định bởi tiêu đề và bài viết đầu tiên."
     inappropriate: "Bài viết của bạn được đánh dấu là **inappropriate**: cộng đồng cảm thấy đó là sự xúc phạm, lăng mạ, hoặc vi phạm [nội quy diễn đàn](%{base_path}/guidelines)."
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index 36ad0a7992..de6ef9e505 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -12,10 +12,10 @@ zh_CN:
   datetime_formats: &datetime_formats
     formats:
       short: "%Y-%m-%d"
-      short_no_year: "%m月%d日"
-      date_only: "%Y年%m月%d日"
-      long: "%Y年%m月%-d日 %H:%M"
-      no_day: "%Y年%m月"
+      short_no_year: "%-m 月 %-d 日"
+      date_only: "%Y 年%-m 月 %-d 日"
+      long: "%Y 年%-m 月 %-d 日 %H:%M"
+      no_day: "%Y 年 %-m 月"
   date:
     month_names:
     - null
@@ -50,7 +50,7 @@ zh_CN:
   anonymous: "匿名"
   remove_posts_deleted_by_author: "被作者删除"
   redirect_warning: "我们无法验证您选择的链接是否确实发布到了论坛。如果您仍想继续，请选择下面的链接。"
-  on_another_topic: "在另外的话题中"
+  on_another_topic: "在另一个话题中"
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number}，来自 %{username}"
@@ -103,6 +103,9 @@ zh_CN:
       maximum_staged_user_per_email_reached: "已达到每个电子邮件可以创建的暂存用户的上限。"
       no_subject: "（无主题）"
       no_body: "（无正文）"
+      missing_attachment: "（附件 %{filename} 缺失）"
+      continuing_old_discussion:
+        other: "从[%{title}](%{url})继续讨论，因为它是在超过 %{count} 天前创建的。"
       errors:
         empty_email_error: "当我们收到的原始邮件为空白时，就会发生这种情况。"
         no_message_id_error: "当邮件没有“Message-Id”标头时，就会发生这种情况。"
@@ -147,7 +150,7 @@ zh_CN:
       invalid: 无效
       is_invalid: "似乎不清楚，这是一个完整的句子？"
       is_invalid_meaningful: "似乎不清楚，大多数字眼都包含重复的字母？"
-      is_invalid_unpretentious: "似乎不清楚，一个或多个单词很长？"
+      is_invalid_unpretentious: "似乎不清楚，一个或多个字词很长？"
       is_invalid_quiet: "似乎不清楚，您是要用全部大写字母输入吗？"
       invalid_timezone: "“%{tz}”不是一个有效的时区"
       contains_censored_words: "包含以下敏感词：%{censored_words}"
@@ -160,6 +163,8 @@ zh_CN:
       max_emojis: "不能超过 %{max_emojis_count} 个表情符号"
       emojis_disabled: "不能有表情符号"
       ip_address_already_screened: "已包含在现有规则中"
+      restrict_dependent_destroy:
+        other: "由于存在独立的%{record}，无法删除记录"
       too_long:
         other: 过长（最多 %{count} 个字符）
       too_short:
@@ -181,7 +186,7 @@ zh_CN:
       default_categories_already_selected: "您不能选择其他列表中使用的类别。"
       default_tags_already_selected: "您不能选择在另一个列表中使用的标签。"
       s3_upload_bucket_is_required: "除非提供 's3_upload_bucket'，否则您无法启用上传到 S3。"
-      enable_s3_uploads_is_required: "除非已启用 S3 上传，否则您无法使用 S3 清单。"
+      enable_s3_uploads_is_required: "除非已启用 S3 上传，否则您无法启用 S3 清单使用情况。"
       page_publishing_requirements: "如果启用了安全媒体，则无法启用页面发布。"
       s3_backup_requires_s3_settings: "除非提供 '%{setting_name}'，否则无法将 S3 用作备份位置。"
       s3_bucket_reused: "您无法将同一个存储桶同时用作 's3_upload_bucket' 和 's3_backup_bucket'。请选择一个不同的存储桶或为每个存储桶使用不同的路径。"
@@ -216,14 +221,15 @@ zh_CN:
       <p> <a href="%{base_url}">%{site_name}</a> 的邀请无法再确认。请让邀请人重新发送新邀请。</p>
     user_exists: "不需要邀请 <b>%{email}</b>，他们<a href='%{base_path}/u/%{username}/summary'>已经拥有帐户！</a>"
     invite_exists: "您已经邀请 <b>%{email}</b>。"
-    invalid_email: "'%{email}' 不是一个有效的电子邮件地址。"
+    invalid_email: "%{email} 不是有效的电子邮件地址。"
     rate_limit:
-      other: "您在过去一天内发出了 %{count} 个邀请，请等待 %{time_left}，然后重试。"
+      other: "您在过去 24 小时内发出了 %{count} 个邀请，请等待 %{time_left}，然后重试。"
     confirm_email: "<p>快完成了！我们向您的电子邮件地址发送了一封激活邮件。请按照邮件中的说明操作来激活您的帐户。</p><p>如果您没有收到邮件，请检查您的垃圾邮件文件夹。</p>"
     cant_invite_to_group: "您无权邀请用户加入指定群组。请确保您是邀请其他人加入的群组的所有者。"
     disabled_errors:
       discourse_connect_enabled: "邀请已被禁用，因为 DiscourseConnect 已启用。"
       invalid_access: "您没有权限查看请求的资源。"
+    requires_groups: "邀请已保存。要授予对指定话题的访问权限，请添加以下群组之一：%{groups}。"
   bulk_invite:
     file_should_be_csv: "上传的文件应为 csv 格式。"
     max_rows: "前 %{max_bulk_invites} 个邀请已发出。尝试将文件拆分成更小的部分。"
@@ -259,6 +265,7 @@ zh_CN:
   invalid_whisper_access: "没有启用密语或者您无权创建密语帖子"
   not_in_group:
     title_topic: "您需要请求加入 `%{group}` 群组才能查看此话题。"
+    title_category: "您需要请求加入 `%{group}` 群组才能查看此类别。"
     request_membership: "请求成员资格"
     join_group: "加入群组"
   deleted_topic: "糟糕！此话题已被删除且不再可用。"
@@ -316,10 +323,10 @@ zh_CN:
   not_accepting_pms: "抱歉，%{username} 目前不接受消息。"
   max_pm_recipients: "抱歉，您最多可以向 %{recipients_limit} 个收件人发送消息。"
   pm_reached_recipients_limit: "抱歉，消息中的收件人不能超过 %{recipients_limit} 个。"
-  removed_direct_reply_full_quotes: "已自动移除对上一个完整帖子的引用。"
+  removed_direct_reply_full_quotes: "已自动移除对整个上一个帖子的引用。"
   watched_words_auto_tag: "已自动为话题添加标签"
   secure_upload_not_allowed_in_public_topic: "抱歉，无法在公开话题中使用以下安全上传：%{upload_filenames}。"
-  create_pm_on_existing_topic: "抱歉，您无法在现有话题上创建私信。"
+  create_pm_on_existing_topic: "抱歉，您无法在现有话题上创建 PM。"
   slow_mode_enabled: "此话题处于慢速模式。"
   just_posted_that: "与您最近发布的内容过于相似"
   invalid_characters: "包含无效字符"
@@ -353,7 +360,7 @@ zh_CN:
     user_posts: "%{username} 的最新帖子"
     user_topics: "%{username} 的最新话题"
     tag: "带标签的话题"
-    badge: "%{site_title} 上的%{display_name}徽章"
+    badge: "%{site_title}上的%{display_name}徽章"
   too_late_to_edit: "该话题在很早之前创建。无法再编辑或者删除。"
   edit_conflict: "该帖子已由其他用户编辑，您的变更无法再保存。"
   revert_version_same: "当前版本与您尝试还原到的版本相同。"
@@ -383,7 +390,7 @@ zh_CN:
       can_not_modify_automatic: "您不能修改自动生成的群组"
       member_already_exist:
         other: "以下用户已是此群组的成员：%{username}"
-      invalid_domain: "'%{domain}' 不是有效域名。"
+      invalid_domain: "'%{domain}' 不是有效网域。"
       invalid_incoming_email: "'%{email}' 不是有效的电子邮件地址。"
       email_already_used_in_group: "'%{email}' 已被群组 '%{group_name}' 使用。"
       email_already_used_in_category: "'%{email}' 已被类别 '%{category_name}' 使用。"
@@ -556,7 +563,7 @@ zh_CN:
         watched_word:
           attributes:
             word:
-              too_many: "对该操作敏感词过多"
+              too_many: "该操作的关注词过多"
             base:
               invalid_url: "替换 URL 无效"
       <<: *errors
@@ -616,7 +623,7 @@ zh_CN:
       uncategorized_parent: "未分类不能有父类别"
       self_parent: "子类别的父类别不能是它自己。"
       depth: "您不能将一个子类别嵌套在其他子类别下。"
-      invalid_email_in: "'%{email}' 不是一个有效的电子邮件地址。"
+      invalid_email_in: "'%{email}' 不是有效的电子邮件地址。"
       email_already_used_in_group: "'%{email}' 已被群组 '%{group_name}' 使用。"
       email_already_used_in_category: "'%{email}' 已被类别 '%{category_name}' 使用。"
       description_incomplete: "类别描述帖子至少要有一段。"
@@ -915,7 +922,7 @@ zh_CN:
   unsubscribed:
     title: "已更新电子邮件偏好设置！"
     description: "<b>%{email}</b> 的电子邮件偏好设置已更新。要更改您的电子邮件设置，请<a href='%{url}'>访问您的用户偏好设置</a>。"
-    topic_description: "要重新订阅 %{link}，请使用话题底部或右侧的通知控件。"
+    topic_description: "要重新订阅%{link}，请使用话题底部或右侧的通知控件。"
     private_topic_description: "要重新订阅，请使用话题底部或右侧的通知控件。"
   uploads:
     marked_insecure_from_theme_component_reason: "在主题组件中使用上传"
@@ -944,7 +951,7 @@ zh_CN:
   user_api_key:
     title: "授权应用程序访问"
     authorize: "授权"
-    read: "阅读"
+    read: "读取"
     read_write: "读/写"
     description: '“%{application_name}”请求对您的帐户进行以下访问：'
     instructions: '我们刚刚生成了一个新的用户 API 密钥供您与“%{application_name}”搭配使用，请将以下密钥粘贴到您的应用程序中：'
@@ -981,7 +988,7 @@ zh_CN:
       labels:
         edited_at: 日期
         post: 帖子
-        editor: 编辑器
+        editor: 编辑者
         author: 作者
         edit_reason: 原因
       description: "新帖子编辑的数量。"
@@ -989,11 +996,11 @@ zh_CN:
       title: "用户举报率"
       labels:
         user: 用户
-        agreed_flags: 确认的举报
-        disagreed_flags: 否决的举报
+        agreed_flags: 同意的举报
+        disagreed_flags: 不同意的举报
         ignored_flags: 忽略的举报
         score: 分数
-      description: "按管理人员对其举报的响应比例排序的用户列表（否决到确认）。"
+      description: "按管理人员对其举报的响应比例排序的用户列表（不同意到同意）。"
     moderators_activity:
       title: "版主活动"
       labels:
@@ -1002,14 +1009,14 @@ zh_CN:
         time_read: 阅读时间
         topic_count: 创建的话题
         post_count: 创建的帖子
-        pm_count: 创建的私信
+        pm_count: 创建的 PM
         revision_count: 修订
-      description: 版主活动列表，包括审查的举报、阅读时间、创建的话题、创建的帖子、创建的个人消息和修订。
+      description: 版主活动列表，包括审核的举报、阅读时间、创建的话题、创建的帖子、创建的个人消息和修订。
     flags_status:
       title: "举报状态"
       values:
-        agreed: 确认
-        disagreed: 否决
+        agreed: 同意
+        disagreed: 不同意
         deferred: 推迟
         no_action: 无行动
       labels:
@@ -1022,7 +1029,7 @@ zh_CN:
     visits:
       title: "用户访问"
       xaxis: "天"
-      yaxis: "访问量"
+      yaxis: "访问次数"
       description: "所有用户访问量。"
     signups:
       title: "注册"
@@ -1053,7 +1060,7 @@ zh_CN:
       description: "登录用户、匿名用户和抓取工具的页面浏览量。"
       labels:
         post: 帖子
-        editor: 编辑器
+        editor: 编辑者
         author: 作者
         edit_reason: 原因
     dau_by_mau:
@@ -1162,25 +1169,25 @@ zh_CN:
       title: "热门推荐人"
       xaxis: "用户"
       num_clicks: "点击数"
-      num_topics: "话题数"
+      num_topics: "话题"
       labels:
         user: "用户"
         num_clicks: "点击数"
-        num_topics: "话题数"
+        num_topics: "话题"
       description: "用户按他们分享的链接的点击次数列出。"
     top_traffic_sources:
       title: "热门流量来源"
-      xaxis: "域名"
+      xaxis: "网域"
       num_clicks: "点击数"
-      num_topics: "话题数"
-      num_users: "用户数"
+      num_topics: "话题"
+      num_users: "用户"
       labels:
-        domain: 域名
+        domain: 网域
         num_clicks: 点击数
-        num_topics: 话题数
+        num_topics: 话题
       description: "链接到此站点最多的外部来源。"
     top_referred_topics:
-      title: "热门推荐主题"
+      title: "热门推荐话题"
       labels:
         num_clicks: "点击数"
         topic: "话题"
@@ -1220,7 +1227,7 @@ zh_CN:
       xaxis: "天"
       yaxis: "用于实时更新和跟踪的请求"
     http_2xx_reqs:
-      title: "HTTP 2xx（正常）"
+      title: "状态 2xx（正常）"
       xaxis: "天"
       yaxis: "成功的请求（状态 2xx）"
     http_3xx_reqs:
@@ -1275,7 +1282,7 @@ zh_CN:
       title: "管理员登录"
       labels:
         user: 用户
-        location: 位置
+        location: 地点
         login_at: 登录时间
       description: "带有位置的管理员登录时间列表。"
     top_uploads:
@@ -1301,7 +1308,7 @@ zh_CN:
     memory_warning: "您的服务器运行的总内存不足 1 GB。建议使用至少 1 GB 的内存。"
     google_oauth2_config_warning: '服务器被配置为允许通过 Google OAuth2 注册和登录 (enable_google_oauth2_logins)，但是没有设置客户端 ID 和客户端密钥值。前往<a href="%{base_path}/admin/site_settings">站点设置</a>并更新设置。<a href="https://meta.discourse.org/t/configuring-google-login-for-discourse/15858" target="_blank">请参阅此指南以了解详情</a>。'
     facebook_config_warning: '服务器被配置为允许通过 Facebook 注册和登录 (enable_facebook_logins)，但是没有设置应用 ID 和应用密钥值。前往<a href="%{base_path}/admin/site_settings">站点设置</a>并更新设置。<a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">请参阅此指南以了解详情</a>。'
-    twitter_config_warning: '服务器被配置为允许通过 Twitter 注册和登录 (enable_twitter_logins)，但是没有设置键和密钥值。前往<a href="%{base_path}/admin/site_settings">站点设置</a>并更新设置。<a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">请参阅此指南以了解详情</a>。'
+    twitter_config_warning: '服务器被配置为允许通过 Twitter 注册和登录 (enable_twitter_logins)，但是没有设置密钥和密钥代码。前往<a href="%{base_path}/admin/site_settings">站点设置</a>并更新设置。<a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">请参阅此指南以了解详情</a>。'
     github_config_warning: '服务器被配置为允许通过 GitHub 注册和登录 (enable_github_logins)，但是没有设置客户端 ID 和密钥值。前往<a href="%{base_path}/admin/site_settings">站点设置</a>并更新设置。<a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">请参阅此指南以了解详情</a>。'
     s3_config_warning: '服务器被配置为将文件上传到 S3，但未设置以下设置中的至少一个：s3_access_key_id、s3_secret_access_key、s3_use_iam_profile 或 s3_upload_bucket。前往<a href="%{base_path}/admin/site_settings">站点设置</a>并更新设置。<a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">请参阅“如何设置将图片上传到 S3？”以了解详情</a>。'
     s3_backup_config_warning: '服务器被配置为将备份上传到 S3，但未设置以下设置中的至少一个：s3_access_key_id、s3_secret_access_key、s3_use_iam_profile 或 s3_backup_bucket。前往<a href="%{base_path}/admin/site_settings">站点设置</a>并更新设置。<a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">请参阅“如何设置将图片上传到 S3？”以了解详情</a>。'
@@ -1318,6 +1325,7 @@ zh_CN:
     force_https_warning: "您的网站正在使用 SSL。但是，您的站点设置中尚未启用 `<a href='%{base_path}/admin/site_settings/category/all_results?filter=force_https'>force_https</a>`。"
     out_of_date_themes: "以下主题有更新："
     unreachable_themes: "我们无法检查以下主题的更新："
+    watched_word_regexp_error: "'%{action}' 关注词的正则表达式无效。请检查您的<a href='%{base_path}/admin/customize/watched_words'>关注词设置</a>，或禁用“关注词正则表达式”站点设置。"
   site_settings:
     display_local_time_in_user_card: "打开用户卡片时，根据用户的时区显示当地时间。"
     censored_words: "将被自动替换为 &#9632;&#9632;&#9632;&#9632; 的字词"
@@ -1340,7 +1348,7 @@ zh_CN:
     min_search_term_length: "最小有效搜索词长度（以字符为单位）"
     search_tokenize_chinese_japanese_korean: "即使在非 CJK 站点上也强制搜索将中文/日语/韩语词例化"
     search_prefer_recent_posts: "如果搜索大型论坛的速度很慢，此选项会首先尝试索引最近的帖子"
-    search_recent_posts_size: "在索引中保留多少最近的帖子"
+    search_recent_posts_size: "在索引中保留多少个最近的帖子"
     log_search_queries: "记录用户执行的搜索查询"
     search_query_log_max_size: "要保留的最大搜索查询量"
     search_query_log_max_retention_days: "保留搜索查询的最长时间（以天为单位）。"
@@ -1349,22 +1357,24 @@ zh_CN:
     category_search_priority_high_weight: "应用于高类别搜索优先级排名的权重。"
     allow_uncategorized_topics: "允许创建没有类别的话题。警告：如果有任何未分类的话题，您必须先对它们进行重新分类，然后才能将其关闭。"
     allow_duplicate_topic_titles: "允许有相同或重复标题的话题。"
+    allow_duplicate_topic_titles_category: "如果类别不同，允许有相同或重复标题的话题。必须禁用 allow_duplicate_topic_titles。"
     unique_posts_mins: "用户可以再次发布相同内容的帖子前需要等待的分钟数"
     educate_until_posts: "当用户开始输入他们的前几 (n) 个新帖子时，在编辑器中显示弹出式新用户教育面板。"
     title: "此站点的名称，在标题标签中使用。"
     site_description: "用一句话描述此站点，用于元描述标签。"
-    short_site_description: "简短描述，用于首页上的标题标签。"
+    short_site_description: "简短描述，用于首页上的 title 标记。"
+    contact_email: "此站点主要负责人的电子邮件地址。用于重要通知，也显示在 <a href='%{base_path}/about' target='_blank'>/about</a> 页面上用于紧急事项。"
     contact_url: "此站点的联系 URL。显示在 <a href='%{base_path}/about' target='_blank'>/about</a> 页面上以应对紧急事项。"
     crawl_images: "从远程 URL 检索图片以插入正确的宽度和高度尺寸。"
     download_remote_images_to_local: "通过下载将远程图片转换为本地图片；这样可以防止图片损坏。"
     download_remote_images_threshold: "将远程图片下载到本地所需的最小磁盘空间（百分比）"
     disabled_image_download_domains: "永远不会从这些网域下载远程图片。以 | 分隔的列表。"
-    editing_grace_period: "发布后 (n) 秒内，编辑不会在发布历史记录中创建新版本。"
-    editing_grace_period_max_diff: "编辑宽限期内允许的最大字符更改数，超过此值将保存另一个帖子修订版（信任级别 0 和 1）"
-    editing_grace_period_max_diff_high_trust: "编辑宽限期内允许的最大字符更改数，超过此值将保存另一个帖子修订版（信任级别 2 及更高）"
+    editing_grace_period: "发帖后 (n) 秒内，编辑不会在帖子历史记录中创建新版本。"
+    editing_grace_period_max_diff: "编辑宽限期内允许的最大字符更改数，超过此值将保存另一个帖子修订（信任级别 0 和 1）"
+    editing_grace_period_max_diff_high_trust: "编辑宽限期内允许的最大字符更改数，超过此值将保存另一个帖子修订（信任级别 2 及更高）"
     staff_edit_locks_post: "如果管理人员编辑过帖子，将锁定编辑"
-    post_edit_time_limit: "信任级别 0 或信任级别 1 的作者可以在发布后的 (n) 分钟内编辑他们的帖子。设置为 0 表示永远可以编辑。"
-    tl2_post_edit_time_limit: "信任级别 2 及更高的作者可以在发布后的 (n) 分钟内编辑他们的帖子。设置为 0 表示永远可以编辑。"
+    post_edit_time_limit: "信任级别 0 或信任级别 1 的作者可以在发帖后的 (n) 分钟内编辑他们的帖子。设置为 0 表示永远可以编辑。"
+    tl2_post_edit_time_limit: "信任级别 2 及更高的作者可以在发帖后的 (n) 分钟内编辑他们的帖子。设置为 0 表示永远可以编辑。"
     edit_history_visible_to_public: "允许所有人查看被编辑过的帖子的先前版本。禁用时，只有管理人员可以查看。"
     delete_removed_posts_after: "被作者移除的帖子将在 (n) 小时后自动删除。如果设置为 0，帖子将被立即删除。"
     max_image_width: "帖子中图片的最大缩略图宽度"
@@ -1372,16 +1382,16 @@ zh_CN:
     responsive_post_image_sizes: "调整灯箱预览图片的大小以允许以下像素比率的高 DPI 屏幕。移除所有值将禁用自适应图片。"
     fixed_category_positions: "如果选中，您将能够按固定顺序排列类别。如果取消选中，则按活动顺序列出类别。"
     fixed_category_positions_on_create: "如果选中，将在话题创建对话框中维护类别排序（需要 fixed_category_positions）。"
-    add_rel_nofollow_to_user_content: '将 rel nofollow 属性添加到提交的所有用户内容，除了内部链接（包括父域名）。如果您更改此设置，则必须使用“rake posts:rebake”重制所有帖子。'
-    exclude_rel_nofollow_domains: "不应将 nofollow 添加到链接的域名列表。example.com 也会自动允许 sub.example.com。至少，您应该添加此站点的网域以帮助网络抓取工具查找所有内容。如果您的网站的其他部分位于其他网域，也可以添加这些部分。"
+    add_rel_nofollow_to_user_content: '将 rel nofollow 属性添加到提交的所有用户内容，除了内部链接（包括父网域）。如果您更改此设置，则必须使用“rake posts:rebake”重新发布所有帖子。'
+    exclude_rel_nofollow_domains: "不应将 nofollow 添加到链接的网域列表。example.com 也会自动允许 sub.example.com。至少，您应该添加此站点的网域以帮助网络抓取工具查找所有内容。如果您的网站的其他部分位于其他网域，也可以添加这些部分。"
     post_excerpt_maxlength: "帖子摘录/摘要的最大长度。"
     topic_excerpt_maxlength: "从话题中的第一个帖子生成的话题摘录/摘要的最大长度。"
     show_pinned_excerpt_mobile: "在移动视图中显示置顶话题的摘录。"
     show_pinned_excerpt_desktop: "在桌面视图中显示置顶话题的摘录。"
-    post_onebox_maxlength: "Onebox 处理后的 Discourse 帖子的最大长度（以字符为单位）。"
-    blocked_onebox_domains: "永远不会被 Onebox 处理的域名列表。"
-    allowed_inline_onebox_domains: "如果在没有标题的情况下链接，将以微型形式进行 Onebox 处理的域名列表"
-    enable_inline_onebox_on_all_domains: "忽略 inline_onebox_domain_allowlist 站点设置并在所有域名上允许内联 Onebox。"
+    post_onebox_maxlength: "Onebox Discourse 帖子的最大长度（以字符为单位）。"
+    blocked_onebox_domains: "永远不会进行 Onebox 处理的网域列表。"
+    allowed_inline_onebox_domains: "如果在没有标题的情况下链接，将以微型形式进行 Onebox 处理的网域列表"
+    enable_inline_onebox_on_all_domains: "忽略 inline_onebox_domain_allowlist 站点设置并在所有网域上允许内联 Onebox。"
     force_custom_user_agent_hosts: "对所有请求使用自定义 Onebox 用户代理的主机。（对于限制用户代理访问的主机特别有用）。"
     max_oneboxes_per_post: "帖子中的最大 Onebox 数量。"
     facebook_app_access_token: "从您的 Facebook 应用 ID 和密钥生成的令牌。用于生成 Instagram Onebox。"
@@ -1398,8 +1408,8 @@ zh_CN:
     favicon: "您的站点的网站图标，请参阅 <a href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://zh.wikipedia.org/wiki/Favicon</a>。如果要正确地通过 CDN 分发，它必须是 png 图片。将调整为 32x32。如果留空，将使用 large_icon。"
     apple_touch_icon: "用于 Apple 触控设备的图标。将自动调整为 180x180。如果留空，将使用 large_icon。"
     opengraph_image: "默认 OpenGraph 图片，当页面没有其他合适的图片时使用。如果留空，将使用 large_icon。"
-    twitter_summary_large_image: "Twitter卡片“摘要大图”（宽度至少应为 280，高度至少为 150）。如果留空，则使用 opengraph_image 生成常规卡片元数据。"
-    notification_email: "发件人：发送所有重要系统电子邮件时使用的电子邮件地址。此处指定的域名必须正确设置 SPF、DKIM 和反向 PTR 记录才能收到电子邮件。"
+    twitter_summary_large_image: "Twitter 卡片 'summary large image'（宽度至少应为 280，高度至少为 150）。如果留空，则使用 opengraph_image 生成常规卡片元数据。"
+    notification_email: "发送所有重要系统电子邮件时使用的 from: 电子邮件地址。此处指定的网域必须正确设置 SPF、DKIM 和反向 PTR 记录才能收到电子邮件。"
     email_custom_headers: "以 | 分隔的自定义电子邮件标头列表。"
     email_subject: "标准电子邮件的可自定义主题格式。请参阅 <a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801</a>"
     detailed_404: "向用户提供有关他们无法访问特定话题的更多详细信息。注意：这不太安全，因为用户会知道 URL 是否链接到有效话题。"
@@ -1428,34 +1438,36 @@ zh_CN:
     max_replies_in_first_day: "用户在创建第一个帖子后 24 小时内允许创建的最大回复数"
     tl2_additional_likes_per_day_multiplier: "通过乘以此数字来提升 tl2（成员）每天的点赞限值"
     tl3_additional_likes_per_day_multiplier: "通过乘以此数字来提升 tl3（常规）每天的点赞限值"
-    tl4_additional_likes_per_day_multiplier: "通过乘以此数字来提升 tl4（资深用户）每天的点赞限值"
+    tl4_additional_likes_per_day_multiplier: "通过乘以此数字来提升 tl4（领导者）每天的点赞限值"
     tl2_additional_edits_per_day_multiplier: "通过乘以此数字来提升 tl2（成员）每天的编辑限值"
     tl3_additional_edits_per_day_multiplier: "通过乘以此数字来提升 tl3（常规）每天的编辑限值"
-    tl4_additional_edits_per_day_multiplier: "通过乘以此数字来提升 tl4（资深用户）每天的编辑限值"
-    num_users_to_silence_new_user: "如果新用户的帖子收到来自这么多不同用户的 num_spam_flags_to_silence_new_user spam 次举报，则隐藏他们的所有帖子并阻止以后发帖。设置为 0 将禁用。"
-    num_tl3_flags_to_silence_new_user: "如果新用户的帖子收到来自 num_tl3_users_to_silence_new_user 个信任级别为 3 的不同用户的这么多次举报，则隐藏他们的所有帖子并阻止以后发帖。设置为 0 将禁用。"
-    num_tl3_users_to_silence_new_user: "如果新用户的帖子收到这么多来自信任级别为 3 的不同用户的 num_tl3_flags_to_silence_new_user 次举报，则隐藏他们的所有帖子并阻止以后发帖。设置为 0 将禁用。"
+    tl4_additional_edits_per_day_multiplier: "通过乘以此数字来提升 tl4（领导者）每天的编辑限值"
+    num_users_to_silence_new_user: "如果新用户的帖子收到来自此数量的不同用户的 num_spam_flags_to_silence_new_user spam 次举报，则隐藏他们的所有帖子并阻止以后发帖。设置为 0 将禁用。"
+    num_tl3_flags_to_silence_new_user: "如果新用户的帖子收到来自 num_tl3_users_to_silence_new_user 个信任级别为 3 的不同用户的此数量的举报，则隐藏他们的所有帖子并阻止以后发帖。设置为 0 将禁用。"
+    num_tl3_users_to_silence_new_user: "如果新用户的帖子收到此数量的来自信任级别为 3 的不同用户的 num_tl3_flags_to_silence_new_user 次举报，则隐藏他们的所有帖子并阻止以后发帖。设置为 0 将禁用。"
     notify_mods_when_user_silenced: "如果用户被自动禁言，则向所有版主发送消息。"
     flag_sockpuppets: "如果新用户从与发起话题的用户相同的 IP 地址回复话题，则将他们的两个帖子举报为潜在垃圾信息。"
     traditional_markdown_linebreaks: "在 Markdown 中使用传统的换行符，需要两个尾随空格。"
     enable_markdown_typographer: "使用排版规则提高文本的可读性：将直引号 ' 替换为弯引号 ’，将 (c) (tm) 替换为符号，将 -- 替换为破折号 - 等"
     enable_markdown_linkify: "自动将看起来像链接的文本视为链接：www.example.com 和 https://example.com 将自动添加链接"
-    markdown_linkify_tlds: "自动被视为链接的顶级域名列表"
+    markdown_linkify_tlds: "自动被视为链接的顶级网域列表"
     markdown_typographer_quotation_marks: "双引号和单引号替换对的列表"
     post_undo_action_window_mins: "允许撤消对帖子的最近操作（例如，举报等）的分钟数。"
     must_approve_users: "管理人员必须先批准所有新用户帐户，然后他们才能访问该站点。"
     invite_code: "用户必须输入此代码才能注册帐户，为空时将被忽略（不区分大小写）"
-    approve_suspect_users: "将可疑用户添加到审查队列中。可疑用户已进入个人简介/网站，但没有阅读活动。"
-    review_every_post: "所有帖子都必须经过审查。警告！不建议用于繁忙的站点。"
+    approve_suspect_users: "将可疑用户添加到审核队列中。可疑用户已进入个人简介/网站，但没有阅读活动。"
+    review_every_post: "所有帖子都必须经过审核。警告！不建议用于繁忙的站点。"
+    pending_users_reminder_delay_minutes: "如果新用户等待批准的时间超过此分钟数则通知版主。设置为 -1 可禁用通知。"
     persistent_sessions: "当网络浏览器关闭后，用户将保持登录状态"
     maximum_session_age: "自上次访问以来，用户将保持登录状态 n 小时"
     ga_version: "要使用的 Google Universal Analytics 版本：v3 (analytics.js)、v4 (gtag)"
     ga_universal_tracking_code: "Google Universal Analytics 跟踪代码 ID，例如：UA-12345678-9；请参阅 <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
     ga_universal_domain_name: "Google Universal Analytics 域名，例如：mysite.com；请参阅 <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
-    ga_universal_auto_link_domains: "启用 Google Universal Analytics 跨网域跟踪。指向这些域名的出站链接将在其中添加客户端 ID。请参阅 <a href='https://support.google.com/analytics/answer/1034342?hl=en' target='_blank'>Google 的跨网域跟踪指南</a>。"
+    ga_universal_auto_link_domains: "启用 Google Universal Analytics 跨网域跟踪。指向这些网域的出站链接将在其中添加客户端 ID。请参阅 <a href='https://support.google.com/analytics/answer/1034342?hl=en' target='_blank'>Google 的跨网域跟踪指南</a>。"
     gtm_container_id: "Google 跟踪代码管理器容器 ID。例如：GTM-ABCDEF。<br/>注意：可能需要在 'content security policy script src' 中将 GTM 加载的第三方脚本列入许可名单。"
     enable_escaped_fragments: "如果未检测到网络抓取工具，则回退到 Google 的 Ajax-Crawling API。请参阅 <a href='https://developers.google.com/webmasters/ajax-crawling/docs/learn-more' target='_blank'>https://developers.google.com/webmasters/ajax-crawling/docs/learn-more</a>"
     moderators_manage_categories_and_groups: "允许版主管理类别和群组"
+    moderators_change_post_ownership: "允许版主更改帖子所有权"
     cors_origins: "允许跨源请求（CORS）。每个来源必须包括 http:// 或 https://。环境变量 DISCOURSE_ENABLE_CORS 必须设置为 true 才能启用 CORS。"
     use_admin_ip_allowlist: "只有使用“屏蔽的 IP 列表”（管理 > 日志 > 屏蔽的 IP）中的 IP 地址时，管理员才能登录。"
     blocked_ip_blocks: "Discourse 不应抓取的私有 IP 地址段列表"
@@ -1463,7 +1475,7 @@ zh_CN:
     allowed_onebox_iframes: "通过 Onebox 嵌入允许的 iframe src 网域列表 `*` 将允许所有默认的 Onebox 引擎。"
     allowed_iframes: "Discourse 可以安全地在帖子中允许的 iframe src 网域前缀列表"
     allowed_crawler_user_agents: "应被允许访问站点的网络抓取工具的用户代理。警告！设置此项将禁止此处未列出的所有抓取工具！"
-    blocked_crawler_user_agents: "用户代理字符串中唯一不区分大小写的词，用于标识不应被允许访问站点的网抓取工具。如果定义了许可名单，则不适用。"
+    blocked_crawler_user_agents: "用户代理字符串中唯一不区分大小写的字词，用于标识不应被允许访问站点的网抓取工具。如果定义了许可名单，则不适用。"
     slow_down_crawler_user_agents: "网络抓取工具的用户代理，应使用 Crawl-delay 指令在 robots.txt 中进行速率限制"
     slow_down_crawler_rate: "如果指定了 slow_down_crawler_user_agents，则此速率将应用于所有抓取工具（请求之间的延迟秒数）"
     content_security_policy: "启用内容安全策略"
@@ -1496,817 +1508,831 @@ zh_CN:
     send_old_credential_reminder_days: "几天后提醒旧凭据"
     email_token_valid_hours: "“忘记密码了”/“激活帐户”令牌的有效期为 (n) 小时。"
     enable_badges: "启用徽章系统"
-    enable_whispers: "允许管理人员在话题中进行私人交流。"
-    allow_index_in_robots_txt: "在 robots.txt 中指定此站点允许被网络搜索引擎索引。在特殊情况下，您可以永久<a href='%{base_path}/admin/customize/robots'>覆盖 robots.txt</a>。"
+    max_favorite_badges: "用户可以选择的最大徽章数"
+    enable_whispers: "允许管理人员在话题中进行不公开交流。"
+    allow_index_in_robots_txt: "在 robots.txt 中指定此站点允许被网络搜索引擎索引。在特殊情况下，您可以永久<a href='%{base_path}/admin/customize/robots'>替换 robots.txt</a>。"
     blocked_email_domains: "不允许用户用于注册帐户的以 | 分隔的电子邮件网域列表。示例：mailinator.com|trashmail.net"
     allowed_email_domains: "用户注册帐户时必须使用的以 | 分隔的电子邮件网域列表。警告：不允许使用除所列网域以外的电子邮件网域的用户！"
     auto_approve_email_domains: "使用此网域列表中电子邮件地址的用户将自动获得批准。"
-    hide_email_address_taken: "通过邮件地址注册账户或忘记密码时不反馈用户账户是否存在的信息。"
-    log_out_strict: "当退出登录时，退出用户在所有设备上的会话"
-    version_checks: "Ping Discourse Hub以获取版本更新并在<a href='%{base_path}/admin' target='_blank'>/admin</a>仪表板上显示新版本消息"
-    new_version_emails: "当新版本发布时，发送一封邮件至 contact_email 设置的地址。"
-    invite_expiry_days: "多少天以内用户的邀请码是有效的"
-    invite_only: "所有的新用户都需要被可信的用户或管理人员邀请。公开注册已禁用。"
-    login_required: "需要验证才能继续在该站阅读，不允许匿名访问。"
-    min_username_length: "最小用户名长度。警告：如果任何现存的用户或群组名字长度比这短，站点将无法正常工作！"
-    max_username_length: "最大用户名长度。警告：如果任何现存的用户或群组名字长度比这长，站点将无法正常工作！"
-    unicode_usernames: "允许用户名和群组名含有Unicode字符和数字。"
-    allowed_unicode_username_characters: "用户名中所允许的Unicode字符的正则表达式。ASCII字符和数字始终是被允许的不需要包含在内。"
-    reserved_usernames: "不可注册的用户名。通配符 * 能用来匹配字符 0 到多次。"
+    hide_email_address_taken: "在注册期间和在“忘记密码”表单中不通知用户存在使用给定电子邮件地址的帐户。"
+    log_out_strict: "退出时，退出用户在所有设备上的会话"
+    version_checks: "Ping Discourse Hub 以获取版本更新并在 <a href='%{base_path}/admin' target='_blank'>/admin</a> 仪表板上显示新版本消息"
+    new_version_emails: "当有新版本的 Discourse 时，向 contact_email 地址发送一封电子邮件。"
+    invite_expiry_days: "用户邀请密钥的有效期，以天为单位"
+    invite_only: "所有新用户必须由受信任的用户或管理人员明确邀请。公共注册被禁用。"
+    login_required: "需要进行身份验证才能阅读此站点上的内容，禁止匿名访问。"
+    min_username_length: "最小用户名长度。警告：如果任何现有用户或群组名称的长度比此数值短，您的站点将无法正常工作！"
+    max_username_length: "最大用户名长度。警告：如果任何现有用户或群组名称的长度比此数值长，您的站点将无法正常工作！"
+    unicode_usernames: "允许用户名和群组名称包含 Unicode 字母和数字。"
+    allowed_unicode_username_characters: "仅在用户名中允许某些 Unicode 字符的正则表达式。ASCII 字符和数字将始终被允许，不需要包含在许可名单中。"
+    reserved_usernames: "不允许注册的用户名。通配符 * 可用于匹配任何字符零次或多次。"
     min_password_length: "最小密码长度。"
-    min_admin_password_length: "管理员最短密码长度"
-    password_unique_characters: "密码中必须包含几个不同的字符。"
-    block_common_passwords: "不允许使用 10,000 个最常用的密码。"
-    auth_skip_create_confirm: 当通过外部授权注册时，跳过创建账户的弹出式窗口，最好与 auth_overrides_email, auth_overrides_username 和 auth_overrides_name 一起使用。
-    auth_immediately: "自动重定向到外部登录系统而无需用户交互。仅在启用 login_required 并且只有一个外部认证方法时有效"
-    enable_discourse_connect: "通过 DiscourseConnect (以前称为“ Discourse SSO”)启用登录(警告：用户的电子邮件地址*必须*由外部站点进行验证！)"
-    verbose_discourse_connect_logging: "将详细的 DiscourseConnect 相关日志记录为 <a href='%{base_path}/logs' target='_blank'>/ 日志</a>"
-    enable_discourse_connect_provider: "在 /session/sso_provider 端点上实现 DiscourseConnect (以前称为“ Discourse SSO”) 协议，需要设置 discourse_connect_provider_secrets"
-    discourse_connect_url: "DiscourseConnect 终端节点的 URL (必须包含 http://或 https://)"
-    discourse_connect_secret: "用于加密验证 DiscourseConnect 信息的密钥字符串，请确保是 10 个字符或者更长"
-    discourse_connect_provider_secrets: "使用 DiscourseConnect 的域名与密钥对列表。确保 SSO 密钥为 10 个字符或更长。通配符 * 可用于匹配任何域名或仅匹配其中的一部分(例如* .example.com)。"
-    discourse_connect_overrides_bio: "覆盖用户个人资料中的用户个人资料，并阻止用户对其进行更改"
-    discourse_connect_overrides_groups: "同步制定群组中手动创建的群组成员的群组属性。\n(警告：如果您不指定群组，所有的手动群组成员资格将被用户清除)"
-    auth_overrides_email: "在每次登录时用外部网站的电子邮件覆盖本地电子邮件，并防止本地更改。适用于所有身份验证提供程序。(警告：由于本地电子邮件的规范化，可能会出现差异)"
-    auth_overrides_username: "在每次登录时，用外部网站的用户名覆盖本地用户名，并防止本地更改。 适用于所有身份验证提供程序。(警告: 由于用户名长度/要求的不同，可能会出现差异)"
-    auth_overrides_name: "每次登录都使用外部站点的全名覆盖本地全名，并且禁止本地修改。应用于所有的身份认证提供商。"
-    discourse_connect_overrides_avatar: "使用外部站点的头像覆盖用户头像。如果启用，则不允许用户在Discourse上传头像。"
-    discourse_connect_overrides_location: "使用DiscourseConnect数据中的位置覆盖用户位置，并且禁止本地修改。"
-    discourse_connect_overrides_website: "使用DiscourseConnect数据中的网站覆盖用户网站，并且禁止本地修改。"
-    discourse_connect_overrides_profile_background: "使用DiscourseConnect数据中的外部站点头像覆盖用户资料背景。"
-    discourse_connect_overrides_card_background: "使用DiscourseConnect数据中的外部站点头像覆盖用户卡片背景。"
-    discourse_connect_not_approved_url: "将未批准的DiscourseConnect账户重定向到这个 URL"
-    discourse_connect_allows_all_return_paths: "不限制DiscourseConnect所提供的 return_paths 中的域名（默认情况下retuen path必须位于当前站点）"
-    enable_local_logins: "启用基于本地用户名和密码登录的账户。警告：如果禁用，且之前未配置任何代替的登录方式，则可能无法登录。"
-    enable_local_logins_via_email: "允许用户请求通过电子邮件将一键登录链接发送给他们。"
-    allow_new_registrations: "允许新用户注册。取消选择将阻止任何人创建一个新账户。"
-    enable_signup_cta: "显示推荐创建账户的提示给那些回访的未注册用户。"
-    enable_google_oauth2_logins: "启用Google Oauth2身份验证。是Google目前支持的身份验证方法。需要密钥和秘密。请参阅<a href='https://meta.discourse.org/t/15858' target='_blank'>配置Google登录话语</a>。"
-    google_oauth2_client_id: "Google 应用的 Client ID"
-    google_oauth2_client_secret: "Google 应用的 Client secret"
-    google_oauth2_prompt: "可选的以空格分隔的字符串值列表，指定授权服务器是否提示用户进行重新认证和同意。请参阅<a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'> https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a >为可能的值。"
-    google_oauth2_hd: "登录将受限的可选Google Apps Hosted域。请参阅<a href='https://developers.google.com/identity/protocols/OpenIDConnect#hd-param' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#hd- param</a>了解更多详情。"
-    enable_twitter_logins: "启用Twitter身份验证，需要twitter_consumer_key和twitter_consumer_secret。请参阅<a href='https://meta.discourse.org/t/13395'target='_blank'>为Discourse配置Twitter登录（和丰富的嵌入内容）</a>。"
-    twitter_consumer_key: "Twitter身份验证的消费者Key，在<a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>上注册"
-    twitter_consumer_secret: "Twitter身份验证的客户secret，在<a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>上注册"
-    enable_facebook_logins: "启用Facebook身份验证，需要facebook_app_id和facebook_app_secret。请参阅<a href='https://meta.discourse.org/t/13394'target='_blank'>配置Facebook登录Discourse</a>。"
-    facebook_app_id: "在 <a href='https://developers.facebook.com/apps/' target='_blank'>https://developers.facebook.com/apps</a>注册用于Facebook 认证和分享app id。"
-    facebook_app_secret: "用于Facebook身份验证的应用程序secret，在<a href='https://developers.facebook.com/apps/' target='_blank'>https://developers.facebook.com/apps</a>上注册"
-    enable_github_logins: "启用Github身份验证，需要 github_client_id 和 github_client_secret。请参阅<a href='https://meta.discourse.org/t/13745'target='_blank'>配置GitHub登录Discourse</a>。"
-    github_client_id: "Github 身份验证的客户端 ID，在<a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>中注册"
-    github_client_secret: "Github 身份验证的客户端 secret，在<a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>上注册"
-    enable_discord_logins: "允许用户使用DIscord认证？"
-    discord_client_id: 'Discord 客户端 ID（需要申请一个？请访问 <a href="https://discordapp.com/developers/applications/me">Discord 开发者门户</a>)'
-    discord_secret: "Discord Secret Key"
-    discord_trusted_guilds: '只允许这些 Discord 公会的成员通过 Discord 登录。使用公会的数字 ID。更多有关信息，请查看<a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">这里</a>的说明。留空则允许任意公会。'
+    min_admin_password_length: "管理员最小密码长度。"
+    password_unique_characters: "密码必须具有的最小唯一字符数。"
+    block_common_passwords: "不允许使用 10,000 个最常见密码中的密码。"
+    auth_skip_create_confirm: 通过外部身份验证方法注册时，跳过“创建帐户”弹出窗口。最好与 auth_overrides_email、auth_overrides_username 和 auth_overrides_name 一起使用。
+    auth_immediately: "自动重定向到外部登录系统，无需用户交互。仅在启用 login_required 并且只有一个外部身份验证方法时有效"
+    enable_discourse_connect: "通过 DiscourseConnect（以前称为“Discourse SSO”）启用登录（警告：用户的电子邮件地址*必须*由外部站点验证！）"
+    verbose_discourse_connect_logging: "将详细的 DiscourseConnect 相关诊断记录到 <a href='%{base_path}/logs' target='_blank'>/logs</a>"
+    enable_discourse_connect_provider: "在 /session/sso_provider 端点上实现 DiscourseConnect（以前称为“Discourse SSO”）提供商协议，要求设置 discourse_connect_provider_secrets"
+    discourse_connect_url: "DiscourseConnect 端点的 URL（必须包括 http://或 https://）"
+    discourse_connect_secret: "用于加密验证 DiscourseConnect 信息的密钥字符串，确保长度至少为 10 个字符"
+    discourse_connect_provider_secrets: "使用 DiscourseConnect 的网域-密钥对列表。确保 DiscourseConnect 密钥长度至少为 10 个字符。通配符 * 可用于匹配任何网域或仅匹配其中的一部分（例如 *.example.com）。"
+    discourse_connect_overrides_bio: "替换用户个人资料中的用户个人简介，并阻止用户对其进行更改"
+    discourse_connect_overrides_groups: "将所有手动群组成员资格与群组特性中指定的群组同步（警告：如果您不指定群组，将为用户清除所有手动群组成员关系）"
+    auth_overrides_email: "在每次登录时使用外部站点电子邮件替换本地电子邮件，并禁止进行本地更改。适用于所有身份验证服务提供商。（警告：由于本地电子邮件的规范化，可能会出现差异）"
+    auth_overrides_username: "在每次登录时使用外部站点用户名替换本地用户名，并禁止进行本地更改。适用于所有身份验证服务提供商。（警告：由于用户名长度/要求的差异，可能会出现差异）"
+    auth_overrides_name: "在每次登录时使用外部站点全名替换本地全名，并禁止进行本地更改。适用于所有身份验证服务提供商。"
+    discourse_connect_overrides_avatar: "使用来自 DiscourseConnect 有效负载的值替换用户头像。如果启用，将不允许用户在 Discourse 上上传头像。"
+    discourse_connect_overrides_location: "使用来自 DiscourseConnect 有效负载的值替换用户位置，并禁止进行本地更改。"
+    discourse_connect_overrides_website: "使用来自 DiscourseConnect 有效负载的值替换用户网站，并禁止进行本地更改。"
+    discourse_connect_overrides_profile_background: "使用来自 DiscourseConnect 有效负载的值替换用户个人资料背景。"
+    discourse_connect_overrides_card_background: "使用来自 DiscourseConnect 有效负载的值替换用户卡片背景。"
+    discourse_connect_not_approved_url: "将未经批准的 DiscourseConnect 帐户重定向到此 URL"
+    discourse_connect_allows_all_return_paths: "不限制 DiscourseConnect 提供的 return_paths 的网域（默认情况下，返回路径必须在当前站点上）"
+    enable_local_logins: "启用基于本地用户名和密码登录的帐户。警告：如果禁用，并且您之前没有配置至少一种备用登录方法，您可能无法登录。"
+    enable_local_logins_via_email: "允许用户请求通过电子邮件向他们发送一键登录链接。"
+    allow_new_registrations: "允许新用户注册。取消选中此项以防止任何人创建新帐户。"
+    enable_signup_cta: "向回访匿名用户显示通知，提示他们注册帐户。"
+    enable_google_oauth2_logins: "启用 Google Oauth2 身份验证。这是 Google 当前支持的身份验证方法。要求密钥和密钥代码。请参阅<a href='https://meta.discourse.org/t/15858' target='_blank'>为 Discourse 配置 Google 登录</a>。"
+    google_oauth2_client_id: "您的 Google 应用的客户端 ID。"
+    google_oauth2_client_secret: "您的 Google 应用的客户端密钥。"
+    google_oauth2_prompt: "可选的以空格分隔的字符串值列表，指定授权服务器是否提示用户进行重新身份验证和同意。请参阅<a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'> https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a> 了解可能的值。"
+    google_oauth2_hd: "登录将受限的可选 Google Apps 托管网域。请参阅 <a href='https://developers.google.com/identity/protocols/OpenIDConnect#hd-param' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#hd-param</a> 以了解详情。"
+    enable_twitter_logins: "启用 Twitter 身份验证，需要 twitter_consumer_key 和 twitter_consumer_secret。请参阅<a href='https://meta.discourse.org/t/13395' target='_blank'>为 Discourse 配置 Twitter 登录（和丰富的嵌入）</a>。"
+    twitter_consumer_key: "Twitter 身份验证的使用者密钥，在 <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a> 中注册"
+    twitter_consumer_secret: "Twitter 身份验证的使用者密钥代码，在 <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a> 中注册"
+    enable_facebook_logins: "启用 Facebook 身份验证，需要 facebook_app_id 和 facebook_app_secret。请参阅<a href='https://meta.discourse.org/t/13394' target='_blank'>为Discourse 配置 Facebook 登录</a>。"
+    facebook_app_id: "Facebook 身份验证和分享的应用 ID，在 <a href='https://developers.facebook.com/apps/' target='_blank'>https://developers.facebook.com/apps</a> 中注册"
+    facebook_app_secret: "Facebook 身份验证的应用密钥代码，在 <a href='https://developers.facebook.com/apps/' target='_blank'>https://developers.facebook.com/apps</a> 中注册"
+    enable_github_logins: "启用 Github 身份验证，需要 github_client_id 和 github_client_secret。请参阅<a href='https://meta.discourse.org/t/13745' target='_blank'>为 Discourse 配置 GitHub 登录</a>。"
+    github_client_id: "Github 身份验证的客户端 ID，在 <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a> 中注册"
+    github_client_secret: "Github 身份验证的客户端密钥，在 <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a> 中注册"
+    enable_discord_logins: "允许用户使用 Discord 进行身份验证？"
+    discord_client_id: 'Discord 客户端 ID（需要申请一个？请访问 <a href="https://discordapp.com/developers/applications/me">Discord 开发者门户</a>）'
+    discord_secret: "Discord 密钥"
+    discord_trusted_guilds: '只允许这些 Discord 公会的成员通过 Discord 登录。使用公会的数字 ID。有关详情，请查看<a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">此处</a>的说明。留空则允许任意公会。'
     enable_backups: "允许管理员创建论坛备份"
-    maximum_backups: "磁盘保存的最大备份数量。老的备份将自动删除"
-    automatic_backups_enabled: "按照定义的备份频率运行自动备份计划"
+    allow_restore: "允许恢复，这可以替换所有站点数据！除非您计划恢复备份，否则请保持禁用状态"
+    maximum_backups: "磁盘保存的最大备份数量。旧备份将被自动删除"
+    automatic_backups_enabled: "按照定义的备份频率运行自动备份"
     backup_frequency: "备份之间的天数。"
-    s3_backup_bucket: "远端备份 bucket。警告：确认它使私有的 bucket。"
-    s3_endpoint: "可以修改端点以备份到S3兼容服务，如DigitalOcean Spaces或Minio。警告：留空以使用AWS S3。"
-    s3_configure_tombstone_policy: "为逻辑删除上载启用自动删除策略。注意：如果禁用，在删除上载后不会回收空间。"
-    s3_disable_cleanup: "当备份的数量超出所允许的最大值时，不删除S3中的旧备份。"
-    enable_s3_inventory: "使用Amazon S3存储验证上传并生成报告。重要：需要有效的S3证书（包括 access key id & secret access key)。"
-    backup_time_of_day: "备份的 UTC 时间"
-    backup_with_uploads: "在备份日程中包括上传。关闭此项仅备份数据库。"
-    backup_location: "存储备份的位置。重要信息：S3需要在文件设置中输入有效的S3凭据。"
-    backup_gzip_compression_level_for_uploads: "用于压缩上传的Gzip压缩级别"
-    include_thumbnails_in_backups: "备份中包含略缩图。禁用后会使备份文件更小，但是恢复备份后需要rabake所有帖子。"
-    active_user_rate_limit_secs: "更新“上次访问”数据的间隔，单位为秒"
-    verbose_localization: "在界面上显示详细的本地化提示"
-    previous_visit_timeout_hours: "系统判断一次访问之后多少小时后为“上一次”访问"
-    top_topics_formula_log_views_multiplier: "热门话题公式中访问次数因子的值（n）：`log(views_count) * (n) + op_likes_count * 0.5 + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
-    top_topics_formula_first_post_likes_multiplier: "热门话题的计算公式中，首帖被赞的数量的乘数（n）：`log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
-    top_topics_formula_least_likes_per_post_multiplier: "热门话题的计算公式中，赞和帖子数量之间的比例的最小值（n）：`log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
+    s3_backup_bucket: "存放备份的远程存储桶。警告：确认它是私有存储桶。"
+    s3_endpoint: "可以修改端点以备份到 S3 兼容服务，如 DigitalOcean Spaces 或 Minio。警告：如果使用 AWS S3，请留空。"
+    s3_configure_tombstone_policy: "为逻辑删除上传启用自动删除策略。重要提示：如果禁用，在删除上传后不会回收空间。"
+    s3_disable_cleanup: "当备份的数量超出允许的最大值时，不移除 S3 中的旧备份。"
+    enable_s3_inventory: "使用 Amazon S3 清单生成报告并验证上传。重要提示：需要有效的 S3 凭据（访问密钥 ID 和秘密访问密钥）。"
+    backup_time_of_day: "备份的 UTC 时间。"
+    backup_with_uploads: "在计划备份中包括上传。禁用此项只会备份数据库。"
+    backup_location: "存储备份的位置。重要提示：S3 要求在“文件”设置中输入有效的 S3 凭据。"
+    backup_gzip_compression_level_for_uploads: "用于压缩上传的 Gzip 压缩级别。"
+    include_thumbnails_in_backups: "在备份中包含生成的缩略图。禁用此项将使备份更小，但需要在恢复后重新发布所有帖子。"
+    active_user_rate_limit_secs: "更新 'last_seen_at' 字段的频率，以为秒单位"
+    verbose_localization: "在 UI 上显示详细的本地化提示"
+    previous_visit_timeout_hours: "在我们将其视为“上一次”访问之前，访问持续的时间，以小时为单位"
+    top_topics_formula_log_views_multiplier: "热门话题中日志浏览因子 (n) 值的公式：`log(views_count) * (n) + op_likes_count * 0.5 + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
+    top_topics_formula_first_post_likes_multiplier: "热门话题中第一个帖子点赞因子 (n) 值的公式：`log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
+    top_topics_formula_least_likes_per_post_multiplier: "热门话题中每个帖子的最少点赞因子 (n) 值的公式：`log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
     enable_safe_mode: "允许用户进入安全模式以调试插件。"
-    rate_limit_create_topic: "在创建一个话题之后，用户必须间隔多少秒（n）才能创建另一个话题"
-    rate_limit_create_post: "在创建一个帖子之后，用户必须间隔多少秒（n）才能创建另一个帖子"
-    rate_limit_new_user_create_topic: "在创建一个话题后，新用户必须等待(n)秒才能创建另一个话题。"
-    rate_limit_new_user_create_post: "在发表帖子后，新用户必须等待(n)秒才能创建另一个帖子。"
-    max_likes_per_day: "每个用户每天最多能点赞多少次。"
-    max_flags_per_day: "每个用户每天能标记的数量的最大值。"
-    max_bookmarks_per_day: "每用户每天能收藏的最大值。"
-    max_edits_per_day: "每个用户每天能编辑的次数的最大值。"
-    max_topics_per_day: "每个用户每天能创建的话题数量的最大值。"
+    rate_limit_create_topic: "创建话题后，用户必须等待 (n) 秒才能创建另一个话题。"
+    rate_limit_create_post: "发帖后，用户必须等待 (n) 秒才能创建另一个帖子。"
+    rate_limit_new_user_create_topic: "创建话题后，新用户必须等待 (n) 秒才能创建另一个话题。"
+    rate_limit_new_user_create_post: "发帖后，新用户必须等待 (n) 秒才能创建另一个帖子。"
+    max_likes_per_day: "每个用户每天的最大点赞次数。"
+    max_flags_per_day: "每个用户每天的最大举报次数。"
+    max_bookmarks_per_day: "每个用户每天的最大书签数。"
+    max_edits_per_day: "每个用户每天的最大编辑次数。"
+    max_topics_per_day: "用户每天可以创建的最大话题数。"
     max_personal_messages_per_day: "用户每天可以创建的新个人消息话题的最大数量。"
-    max_invites_per_day: "每个用户每天能创建的邀请数量的最大值。"
-    max_topic_invitations_per_day: "每个用户每天能创建的邀请至话题数量的最大值。"
-    max_logins_per_ip_per_hour: "一小时内同一个IP（网络）地址能允许最大的登录次数。"
-    max_logins_per_ip_per_minute: "一分钟内同一个IP（网络）地址能允许最大的登录次数。"
-    max_post_deletions_per_minute: "用户每分钟可以删除的最大帖子数。设置为 0 可禁用帖子删除。"
-    max_post_deletions_per_day: "用户每天可以删除的最大帖子数。设置为 0 可禁用帖子删除。"
-    invite_link_max_redemptions_limit: "邀请链接所允许的最大兑换量不能超过这个数值。"
-    invite_link_max_redemptions_limit_users: "普通用户生成的邀请链接数量最大不能超过这个数值。"
-    alert_admins_if_errors_per_minute: "激活管理员警告的每分钟错误的数量。0 会禁用这个特性。注意：需要重启。"
-    alert_admins_if_errors_per_hour: "激活管理员警告的每小时错误的数量。0 会禁用这个特性。注意：需要重启。"
-    categories_topics: "要在 /categories 页面中显示的话题数量。如果设置为0，它将自动尝试寻找一个值来保持两列对称（分类和话题）。"
-    suggested_topics: "在一个话题底部显示的推荐话题的数量。"
-    limit_suggested_to_category: "只在当前分类的推荐帖子列表中显示帖子。"
-    suggested_topics_max_days_old: "推荐话题的创建时间不能超过 n 天。"
-    suggested_topics_unread_max_days_old: "推荐的未读话题创建时间不能大于 n 天。"
-    clean_up_uploads: "移除孤立的已上传资料。警告：您可能想要在启用这个设定前备份一下 /uploads 目录。"
-    clean_orphan_uploads_grace_period_hours: "删除孤立上传资料的宽限期（单位：小时）"
-    purge_deleted_uploads_grace_period_days: "彻底删除孤立的上传内容的宽限期（单位：天）"
-    purge_unactivated_users_grace_period_days: "删除未激活用户账户的宽限期（单位：天）。设置为 0 将永不清除未激活用户。"
-    enable_s3_uploads: "上传至 Amazon S3 存储的地址。重要：需要有效的 S3 验证资料（包括 access key id & secret access key）。"
-    s3_use_iam_profile: '使用<a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html">AWS EC2实例配置文件</a>授予对S3的访问权限。注意：启用此功能需要Discourse在配置得当的EC2实例中运行，并覆盖“s3访问密钥ID”和“s3 secret访问密钥”设置。'
-    s3_upload_bucket: "上传文件保存于 Amazon S3 的 bucket 名字。警告：必须为小写，无句点，无下划线。"
-    s3_access_key_id: "将用于上传图片，附件和备份的Amazon S3 access key id。"
-    s3_secret_access_key: "将用于上传图片，附件和备份的Amazon S3 secret access key。"
-    s3_region: "将用于上传图片和备份的 Amazon S3 区域名。"
-    s3_cdn_url: "用户 S3 资料的 CDN URL（例如：https://cdn.somewhere.com）。警告：在改变该设置后您必须重制所有老帖子。"
+    max_invites_per_day: "用户每天可以发送的最大邀请数。"
+    max_topic_invitations_per_day: "用户每天可以发送的最大话题邀请数。"
+    max_logins_per_ip_per_hour: "每个 IP 地址每小时允许的最大登录次数"
+    max_logins_per_ip_per_minute: "每个 IP 地址每分钟允许的最大登录次数"
+    max_post_deletions_per_minute: "用户每分钟可以删除的最大帖子数。设置为 0 将禁用帖子删除。"
+    max_post_deletions_per_day: "用户每天可以删除的最大帖子数。设置为 0 将禁用帖子删除。"
+    invite_link_max_redemptions_limit: "邀请链接允许的最大确认次数不能超过此值。"
+    invite_link_max_redemptions_limit_users: "普通用户生成的邀请链接允许的最大确认次数不能超过此值。"
+    alert_admins_if_errors_per_minute: "激活管理员警告的每分钟错误数量。值为 0 会禁用此功能。注意：需要重启。"
+    alert_admins_if_errors_per_hour: "激活管理员警告的每小时错误数量。值为 0 会禁用此功能。注意：需要重启。"
+    categories_topics: "要在 /categories 页面中显示的话题数量。如果设置为 0，它将自动尝试寻找一个值来保持两列对称（类别和话题）。"
+    suggested_topics: "在话题底部显示的推荐话题的数量。"
+    limit_suggested_to_category: "仅在推荐话题中显示当前类别中的话题"
+    suggested_topics_max_days_old: "推荐话题的存在时间不应超过 n 天。"
+    suggested_topics_unread_max_days_old: "推荐未读话题的存在时间不应超过 n 天。"
+    clean_up_uploads: "移除孤立的未引用上传以防止非法托管。警告：您可能需要先备份 /uploads 目录，然后才能启用此设置。"
+    clean_orphan_uploads_grace_period_hours: "移除孤立上传之前的宽限期（以小时为单位）。"
+    purge_deleted_uploads_grace_period_days: "擦除已删除的上传之前的宽限期（以天为单位）。"
+    purge_unactivated_users_grace_period_days: "删除尚未激活其帐户的用户之前的宽限期（以天为单位）。设置为 0 将从不清除未激活的用户。"
+    enable_s3_uploads: "将上传放置在 Amazon S3 存储上。重要提示：需要有效的 S3 凭据（访问密钥 ID 和秘密访问密钥）。"
+    s3_use_iam_profile: '使用 <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html">AWS EC2 实例配置文件</a>授予对 S3 存储桶的访问权限。注意：启用此功能需要 Discourse 在适当配置的 EC2 实例中运行，并替换 "s3 access key id" 和 "s3 secret access key" 设置。'
+    s3_upload_bucket: "文件将上传到的 Amazon S3 存储桶名称。警告：必须是小写，没有句点，没有下划线。"
+    s3_access_key_id: "将用于上传图片、附件和备份的 Amazon S3 访问密钥 ID。"
+    s3_secret_access_key: "将用于上传图片、附件和备份的 Amazon S3 秘密访问密钥。"
+    s3_region: "将用于上传图片和备份的 Amazon S3 区域名称。"
+    s3_cdn_url: "用于所有 S3 资产的 CDN URL（例如：https://cdn.somewhere.com）。警告：更改此设置后，您必须重新发布所有旧帖子。"
     avatar_sizes: "自动生成的头像大小列表。"
     external_system_avatars_enabled: "使用外部系统头像服务。"
-    external_system_avatars_url: "外部系统头像服务的 URL 地址。可选参数是 {username} {first_letter} {color} {size}"
-    external_emoji_url: "用于表情图像的外部服务 URL。留空以禁用。"
-    use_site_small_logo_as_system_avatar: "使用网站的小徽标代替系统用户的头像。要求必须有 logo。"
-    restrict_letter_avatar_colors: "用于字符型头像背景的十六进制色彩值列表"
-    selectable_avatars_enabled: "强制用户从列表中选择头像。"
+    external_system_avatars_url: "外部系统头像服务的 URL。允许的替换为 {username} {first_letter} {color} {size}"
+    external_emoji_url: "表情符号图片的外部服务的 URL。留空将禁用。"
+    use_site_small_logo_as_system_avatar: "使用站点的小徽标代替系统用户的头像。要求存在徽标。"
+    restrict_letter_avatar_colors: "用于字母头像背景的 6 位十六进制颜色值列表。"
+    selectable_avatars_enabled: "强制用户从列表中选择一个头像。"
     selectable_avatars: "用户可以选择的头像列表。"
-    allow_all_attachments_for_group_messages: "允许群组私信中包含任何邮件附件。"
-    png_to_jpg_quality: "转换 JPG 文件的质量（1 是最低，99 最高，100 禁用）。"
-    recompress_original_jpg_quality: "上传的图片文件质量(1 是最低，99 最高，100 禁用)。"
-    image_preview_jpg_quality: "缩放图像文件的质量(1是最低质量, 99是最佳质量, 100是禁用)。"
-    allow_staff_to_upload_any_file_in_pm: "允许管理人员在私信中上传任意文件。"
-    strip_image_metadata: "剥离图像元数据。"
-    min_ratio_to_crop: "用于裁剪高图像的比率。输入宽/高值。"
+    allow_all_attachments_for_group_messages: "允许群组消息的所有电子邮件附件。"
+    png_to_jpg_quality: "转换后的 JPG 文件的质量（1 为最低质量，99 为最佳质量，100 为禁用）。"
+    recompress_original_jpg_quality: "上传的图片文件的质量（1 为最低质量，99 为最佳质量，100 为禁用）。"
+    image_preview_jpg_quality: "调整大小的图片文件的质量（1 为最低质量，99 为最佳质量，100 为禁用）。"
+    allow_staff_to_upload_any_file_in_pm: "允许管理人员在 PM 中上传任何文件。"
+    strip_image_metadata: "去除图片元数据。"
+    composer_media_optimization_image_enabled: "启用上传图片文件的客户端媒体优化。"
+    composer_media_optimization_image_bytes_optimization_threshold: "触发客户端优化的最小图片文件大小"
+    composer_media_optimization_image_resize_dimensions_threshold: "触发客户端大小调整的最小图片宽度"
+    composer_media_optimization_image_resize_width_target: "宽度大于 `composer_media_optimization_image_dimensions_resize_threshold` 的图片将调整为此宽度。必须 >= `composer_media_optimization_image_dimensions_resize_threshold`。"
+    composer_media_optimization_image_encode_quality: "重新编码过程中使用的 JPEG 编码质量。"
+    min_ratio_to_crop: "用于裁剪高图片的比率。输入宽度/高度的结果。"
     simultaneous_uploads: "可以在编辑器中拖放的最大文件数"
-    default_invitee_trust_level: "受邀用户的默认信任等级（0-4）。"
-    default_trust_level: "所有新用户的默认信任等级（0-4）。警告！改变此项将使您面临广告泛滥的风险。"
-    tl1_requires_topics_entered: "新用户升级到信任等级1所需要进入的话题数量。"
-    tl1_requires_read_posts: "新用户升级到信任等级1所需要阅读的帖子数量。"
-    tl1_requires_time_spent_mins: "新用户升级到信任等级1需要看帖多少分钟。"
-    tl2_requires_topics_entered: "新用户升级到信任等级2所需要进入的话题数量。"
-    tl2_requires_read_posts: "新用户升级到信任等级2所需要阅读的帖子数量。"
-    tl2_requires_time_spent_mins: "新用户升级到信任等级2需要看帖多少分钟。"
-    tl2_requires_days_visited: "一个初级用户升级到信任等级2所需要访问站点的累计天数。"
-    tl2_requires_likes_received: "一个用户升级到信任等级2所需要获得赞的数量。"
-    tl2_requires_likes_given: "一个用户升级到信任等级2所需要给出赞的数量。"
-    tl2_requires_topic_reply_count: "一个初级用户升级到信任等级2所需要回复的话题数量。"
-    tl3_time_period: "信任等级3考察期限（天数）"
-    tl3_requires_days_visited: "要升到信任等级3所需要的，在最近考察时间段内访问的最低天数。将其设置为高于信任等级3的考察时间可禁用信任等级 3。（设置为 0 或比考察期更长）"
-    tl3_requires_topics_replied_to: "要升到信任等级3所需要的，在最近考察时间段内回复的话题数量。（设置为 0 或更高）"
-    tl3_requires_topics_viewed: "要升到信任等级3所需要的，在最近考察时间段内所查看的新话题的百分比。将其设置为高于信任等级3的考察时间可禁用信任等级 3。（设置为 0 到 100）"
-    tl3_requires_topics_viewed_cap: "要升到信任等级3所需要的，在最近考察时间段内所需查看的话题数上限，与百分比计算后取最小。"
-    tl3_requires_posts_read: "要升到信任等级3所需要的，在最近考察时间段内所查看的新话题的百分比。将其设置为高于信任等级3的考察时间可禁用信任等级 3。（设置为 0 或比考察期更长）"
-    tl3_requires_posts_read_cap: "要升到信任等级3所需要的，在最近考察时间段内所需查看的帖子数上限，与百分比计算后取最小。"
-    tl3_requires_topics_viewed_all_time: "用户升至信任等级3所需查看的最小话题数量。"
-    tl3_requires_posts_read_all_time: "用户升至信任等级3所需查看的最小帖子数量。"
-    tl3_requires_max_flagged: "要提升到信任等级3，用户在考察时间段内不得被x个不同用户标记超过x个帖子，x为此设置的值。（设置为0或更高）"
-    tl3_promotion_min_duration: "信任等级3的用户可被降级至信任等级2前最小持续天数。"
-    tl3_requires_likes_given: "升级到信任等级3，需要在最近的考察期内给出赞的数量。"
-    tl3_requires_likes_received: "升级到信任等级3，需要在最近的考察期内收到赞的数量。"
-    tl3_links_no_follow: "不移除信任等级3用户帖子中的链接中的 rel=nofollow 属性。"
+    default_invitee_trust_level: "受邀用户的默认信任级别 (0-4)。"
+    default_trust_level: "所有新用户的默认信任级别 (0-4)。警告！更改此设置将使您面临垃圾信息的严重风险。"
+    tl1_requires_topics_entered: "新用户在提升到信任级别 1 之前必须参与的话题数量。"
+    tl1_requires_read_posts: "新用户在提升到信任级别 1 之前必须阅读的帖子数量。"
+    tl1_requires_time_spent_mins: "新用户在提升到信任级别 1 之前必须阅读帖子的分钟数。"
+    tl2_requires_topics_entered: "用户在提升到信任级别 2 之前必须参与的话题数量。"
+    tl2_requires_read_posts: "用户在提升到信任级别 2 之前必须阅读的帖子数量。"
+    tl2_requires_time_spent_mins: "用户在提升到信任级别 2 之前必须阅读帖子的分钟数。"
+    tl2_requires_days_visited: "用户在提升到信任级别 2 之前必须访问该站点的天数。"
+    tl2_requires_likes_received: "用户在提升到信任级别 2 之前必须获得的赞数。"
+    tl2_requires_likes_given: "用户在提升到信任级别 2 之前必须送出的赞数。"
+    tl2_requires_topic_reply_count: "用户在提升到信任级别 2 之前必须回复的话题数量。"
+    tl3_time_period: "信任级别 3 要求时间段（以天为单位）"
+    tl3_requires_days_visited: "为了有资格升级到信任级别 3，用户需要在过去 (tl3 time period) 天内访问站点的最小天数。设置高于 tl3 时间段将禁用升级到 tl3。（0 或更高）"
+    tl3_requires_topics_replied_to: "为了有资格升级到信任级别 3，用户需要在过去 (tl3 time period) 天内回复的最小话题数。（0 或更高）"
+    tl3_requires_topics_viewed: "为了有资格升级到信任级别 3，用户需要浏览的在过去 (tl3 time period) 天内创建的话题百分比。（0 到 100）"
+    tl3_requires_topics_viewed_cap: "在过去 (tl3 time period) 天内浏览的最大所需话题数量。"
+    tl3_requires_posts_read: "为了有资格升级到信任级别 3，用户需要浏览的在过去 (tl3 time period) 天内创建的帖子百分比。（0 到 100）"
+    tl3_requires_posts_read_cap: "在过去 (tl3 time period) 天内阅读的最大所需帖子数量。"
+    tl3_requires_topics_viewed_all_time: "为了有资格升级到信任级别 3，用户必须浏览的最小话题总数。"
+    tl3_requires_posts_read_all_time: "为了有资格升级到信任级别 3，用户必须阅读的最小帖子总数。"
+    tl3_requires_max_flagged: "为了有资格升级到信任级别 3，用户在过去 (tl3 time period) 天内不得阅读 x 篇以上由 x 个不同的用户举报的帖子，其中 x 是此设置的值。（0 或更高）"
+    tl3_promotion_min_duration: "在将用户降级回信任级别 2 之前，提升到信任级别 3 所持续的最少天数。"
+    tl3_requires_likes_given: "为了有资格升级到信任级别 3，在过去 (tl3 time period) 天内必须送出的最少赞数。"
+    tl3_requires_likes_received: "为了有资格升级到信任级别 3，在过去 (tl3 time period) 天内必须收到的最少赞数。"
+    tl3_links_no_follow: "不从信任级别 3 用户发布的链接中移除 rel=nofollow。"
     trusted_users_can_edit_others: "允许具有高信任级别的用户编辑其他用户的内容"
-    min_trust_to_create_topic: "创建话题所需的最低信任等级。"
-    allow_flagging_staff: "如果启用，用户可以标记管理人员的帖子。"
-    min_trust_to_edit_wiki_post: "能编辑维基模式帖子的最小信任等级"
-    min_trust_to_edit_post: "能编辑帖子的最小信任等级。"
-    min_trust_to_allow_self_wiki: "用户将自己的帖子设置为维基模式的最低信任等级。"
+    min_trust_to_create_topic: "创建新话题所需的最低信任级别。"
+    allow_flagging_staff: "如果启用，用户可以举报来自管理人员帐户的帖子。"
+    min_trust_to_edit_wiki_post: "编辑标记为 Wiki 的帖子所需的最低信任级别。"
+    min_trust_to_edit_post: "编辑帖子所需的最低信任级别。"
+    min_trust_to_allow_self_wiki: "制作用户自己的帖子 Wiki 所需的最低信任级别。"
     min_trust_to_send_messages: "创建新个人消息所需的最低信任级别。"
-    min_trust_to_send_email_messages: "通过电子邮件发送私信的最低信任等级。"
-    min_trust_to_flag_posts: "标记帖子所需的最低信任级别"
+    min_trust_to_send_email_messages: "通过电子邮件发送个人消息所需的最低信任级别。"
+    min_trust_to_flag_posts: "举报帖子所需的最低信任级别"
     min_trust_to_post_links: "在帖子中包含链接所需的最低信任级别"
-    min_trust_to_post_embedded_media: "在帖子中嵌入媒体项目所需的最低信任等级"
-    min_trust_level_to_allow_profile_background: "上传用户资料背景所需的最低信任等级"
-    min_trust_level_to_allow_user_card_background: "上传用户卡片背景所需的最低信任等级"
-    min_trust_level_to_allow_invite: "可邀请用户的最低信任等级"
+    min_trust_to_post_embedded_media: "在帖子中嵌入媒体条目所需的最低信任级别"
+    min_trust_level_to_allow_profile_background: "上传个人资料背景所需的最低信任级别"
+    min_trust_level_to_allow_user_card_background: "上传用户卡背景所需的最低信任级别"
+    min_trust_level_to_allow_invite: "邀请用户所需的最低信任级别"
     min_trust_level_to_allow_ignore: "忽略用户所需的最低信任级别"
-    allowed_link_domains: "即使用户没有发布链接的信任等级也被视为链接的域名。"
-    newuser_max_links: "一个访问者可以添加到一个帖子里的链接数量。"
-    newuser_max_embedded_media: "新用户能够在帖子中嵌入多少个媒体项目。"
-    newuser_max_attachments: "一个新用户可以添加到一个帖子里的附件数量。"
-    newuser_max_mentions_per_post: "一个访问者可以在一个帖子里使用 @name 提及的最大数量。"
-    newuser_max_replies_per_topic: "直至有人回复他们前，新用户在一个帖子里的最大回复数量。"
-    max_mentions_per_post: "您可以在一个帖子里使用 @name 提及的最大数量。"
-    max_users_notified_per_group_mention: "当群组被提及时，接受提醒的最大用户数 ( 超过阈值后将不发送提醒 )"
+    allowed_link_domains: "即使用户没有适当的信任级别来发布链接，也可以链接到的网域"
+    newuser_max_links: "新用户可以在帖子中添加的链接数量。"
+    newuser_max_embedded_media: "新用户可以向帖子中添加的嵌入式媒体条目数量。"
+    newuser_max_attachments: "新用户可以在帖子中添加的附件数量。"
+    newuser_max_mentions_per_post: "新用户可以在帖子中使用的提及通知的最大数量。"
+    newuser_max_replies_per_topic: "在有人回复他们之前，新用户可以在单个话题中做出的最大回复数。"
+    max_mentions_per_post: "任何人可以在帖子中使用的提及通知的最大数量。"
+    max_users_notified_per_group_mention: "当群组被提及时可能会收到通知的最大用户数（超过阈值后将不发送通知）"
     enable_mentions: "允许用户提及其他用户。"
-    create_thumbnails: "为太大而无法恰当地显示在帖子里的图片创建 lightbox 缩略图。"
-    email_time_window_mins: "等待多少（n）分钟才给用户发送通知电子邮件，好让他们有机会自己来编辑和完善他们的帖子。"
-    personal_email_time_window_seconds: "在发送任何个人消息通知电子邮件之前等待（n）秒，以便用户有机会编辑和完成他们的消息。"
-    email_posts_context: "在通知邮件中包含的作为上下文的回复数量。"
-    flush_timings_secs: "向服务器刷新时间数据的频率，以秒为单位。"
-    title_max_word_length: "在话题的标题中，允许的词语长度的最大字符数。"
-    title_min_entropy: "在话题的标题中，允许的最低熵值（不同字符，非英语字符算作多个）。"
-    body_min_entropy: "在一个帖子内文中，允许的最低熵值（不同字符数，非英语字符算作多个）。"
-    allow_uppercase_posts: "允许标题和内容全大写"
-    max_consecutive_replies: "在阻止添加其他回复之前，用户必须在话题中连续发布的帖子数。"
-    enable_filtered_replies_view: '"(n) 回复"按钮会折叠所有其他帖子，只显示当前帖子及其回复。'
-    title_fancy_entities: "将常见的ASCII字符转换为话题标题中的花哨HTML实体，ala SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</A>"
-    min_title_similar_length: "开始检查相似话题的帖子标题的最小长度。"
+    create_thumbnails: "创建太大而无法放入帖子的缩略图和灯箱图片。"
+    email_time_window_mins: "在发送任何通知电子邮件之前等待 (n) 分钟，让用户有机会编辑和完成他们的帖子。"
+    personal_email_time_window_seconds: "在发送任何个人消息通知电子邮件之前等待 (n) 秒，让用户有机会编辑和完成他们的消息。"
+    email_posts_context: "在通知电子邮件中作为上下文包含的先前回复的数量。"
+    flush_timings_secs: "将计时数据刷新到服务器的频率，以秒为单位。"
+    title_max_word_length: "话题标题中允许的最大字词长度（以字符为单位）。"
+    title_min_entropy: "话题标题所需的最小熵（唯一字符，非英语计数更多）。"
+    body_min_entropy: "帖子正文所需的最小熵（唯一字符，非英语计数更多）。"
+    allow_uppercase_posts: "允许在话题标题或帖子正文中全部使用大写字母。"
+    max_consecutive_replies: "用户在被阻止添加另一个回复之前必须在话题中连续发布的帖子数。"
+    enable_filtered_replies_view: '“(n) 回复”按钮会收起所有其他帖子，仅显示当前帖子及其回复。'
+    title_fancy_entities: "将常见的 ASCII 字符转换为话题标题中的花哨 HTML 实体，又称为 SmartyPants <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
+    min_title_similar_length: "检查有无类似话题之前的标题的最小长度。"
     desktop_category_page_style: "/categories 页面的视觉样式。"
-    category_colors: "设置分类颜色的十六进制色彩值列表。"
-    category_style: "分类图标的视觉样式。"
-    default_dark_mode_color_scheme_id: "在黑暗模式下使用的配色方案。"
+    category_colors: "设置类别允许的十六进制颜色值列表。"
+    category_style: "类别徽章的视觉样式。"
+    default_dark_mode_color_scheme_id: "在深色模式下使用的配色方案。"
     dark_mode_none: "无"
-    max_image_size_kb: "以kB为单位的上传图像最大尺寸。必须同样在nginx（client_max_body_size）/ apache或代理中配置。大于或小于client_max_body_size的图片将被在上传时调整至适当的大小。"
-    max_attachment_size_kb: "允许用户上传的最大文件大小（单位：KB）——同时在 nginx（client_max_body_size），apache 或代理中配置他们。"
-    authorized_extensions: "允许上传文件的扩展名列表（'*' 表示允许所有文件类型）"
-    authorized_extensions_for_staff: "除了在“authorized_extensions”站点设置中定义的列表之外，还运行管理人员上传的文件扩展名列表。（使用'*'启用所有文件类型）"
-    theme_authorized_extensions: "主题上传可用的文件扩展名列表（“*” 可允许所有文件）"
-    max_similar_results: "当用户撰写新话题时，显示多少类似话题给用户。比较是根据标题和内容进行的。"
-    max_image_megapixels: "以百万像素为单位单个图像允许的最大值。高于最大值百万像素的图像将被拒绝。"
-    title_prettify: "防止常见标题里的错别字和错误，包括全部大写，第一个字符小写，多个'！'和'？'，结尾多余的'.'等等。"
-    title_remove_extraneous_space: "删除结尾标点前的空格。"
-    automatic_topic_heat_values: '基于站点活跃度自动更新“topic views heat和“topic post like heat”设置。'
-    topic_views_heat_low: "多少次浏览后，该视图将稍稍高亮。"
-    topic_views_heat_medium: "多少次浏览后，该视图将明显高亮。"
-    topic_views_heat_high: "多少次浏览后，该视图将强烈高亮。"
-    cold_age_days_low: "在讨论开始多少天后，最后活跃日期将稍微变暗。"
-    cold_age_days_medium: "在讨论开始多少天后，最后活跃日期将明显暗淡。"
-    cold_age_days_high: "在讨论开始多少天后，最后活跃日期将显著暗淡。"
-    history_hours_low: "帖子在编辑后编辑指示器轻微高亮的小时数"
-    history_hours_medium: "帖子在编辑后编辑指示器明显高亮的小时数"
-    history_hours_high: "帖子在编辑后编辑指示器强烈高亮的小时数"
-    topic_post_like_heat_low: "在赞/帖子的比值超过这个值后，帖子计数栏将稍微高亮。"
-    topic_post_like_heat_medium: "在赞/帖子的比值超过这个值后，帖子数量一栏将明显高亮。"
-    topic_post_like_heat_high: "在赞与帖子的比例超过此比例后，帖子数量一栏将强烈高亮。"
-    faq_url: "如果您的 FAQ 文档在外部，那么请在此填写其完整 URL 地址。"
-    tos_url: "如果您的服务条款文档在外部，那么请在此填写其完整 URL 地址。"
-    privacy_policy_url: "如果您的隐私政策文档在外部，那么请在此填写其完整 URL 地址。"
-    log_anonymizer_details: "匿名后是否将用户的详细信息保留在日志中。在遵守GDPR时，您需要关闭它。"
-    newuser_spam_host_threshold: "被判定为垃圾前，新用户能发表指向同一主机的链接的次数。"
-    allowed_spam_host_domains: "不需要进行垃圾内容测试的域名列表。新用户永远不会因发表带有这些域名链接的内容而被限制。"
-    staff_like_weight: "管理人员的赞的权重（非管理人员的赞的权重为1）。"
-    topic_view_duration_hours: "按照每 IP/用户每 N 小时来记录一次新的话题访问"
-    user_profile_view_duration_hours: "按照每 IP/用户每 N 小时来记录用户资料访问数"
-    levenshtein_distance_spammer_emails: "匹配到垃圾邮件发送者时，仍将允许字符数差异的模糊匹配。"
-    max_new_accounts_per_registration_ip: "如果已经有了从这个 IP 创建的(n)个信任等级0的账户（并且没有一个是管理人员或者是信任等级2以上的用户），不再允许来自该 IP 地址的注册请求。"
-    min_ban_entries_for_roll_up: "当点击折叠按钮时，且至少 (N) 条记录时，将会创建一个子网封禁记录"
-    max_age_unmatched_emails: "在 (N) 天后删除不匹配的已屏蔽的邮件地址。"
-    max_age_unmatched_ips: "在 (N) 天后删除不匹配的已屏蔽的 IP 记录。"
-    num_flaggers_to_close_topic: "要自动终止一个话题的讨论并介入时所需的最小数量的独立标记者"
-    num_hours_to_close_topic: "暂停话题以介入处理的小时数"
-    auto_respond_to_flag_actions: "当处理标记时启用自动回复。"
-    min_first_post_typing_time: "用户发表第一帖时打字所需的最短时间（以毫秒计），如果没有达到该阈值，帖子将自动进入等待批准队列。设置为 0 禁用（不推荐）"
+    max_image_size_kb: "最大图片上传大小（以 kB 为单位）。也必须在 nginx (client_max_body_size) / apache 或代理中配置。大于此值且小于 client_max_body_size 的图片将调整大小以适合上传。"
+    max_attachment_size_kb: "最大附件文件上传大小（以 kB 为单位）。也必须在 nginx (client_max_body_size) / apache 或代理中配置。"
+    authorized_extensions: "上传允许的文件扩展名列表（使用 '*' 将启用所有文件类型）"
+    authorized_extensions_for_staff: "除了在 `authorized_extensions` 站点设置中定义的列表之外，还允许管理人员用户上传的文件扩展名列表。（使用 '*' 将启用所有文件类型）"
+    theme_authorized_extensions: "主题上传允许的文件扩展名列表（使用 '*' 将启用所有文件类型）"
+    max_similar_results: "撰写新话题时，在编辑器上方显示的类似话题数。比较基于标题和正文。"
+    max_image_megapixels: "图片允许的最大百万像素数。具有更高百万像素数的图片将被拒绝。"
+    title_prettify: "防止常见的标题拼写错误和错误，包括全部大写、第一个字符小写、多个 ! 和 ?、结尾出现额外的 . 等。"
+    title_remove_extraneous_space: "移除末尾标点符号前面的前导空格。"
+    automatic_topic_heat_values: '基于站点活动自动更新“topic views heat”和“topic post like heat”设置。'
+    topic_views_heat_low: "获得此数量的浏览后，浏览字段将被稍稍突出显示。"
+    topic_views_heat_medium: "获得此数量的浏览后，浏览字段将被适度突出显示。"
+    topic_views_heat_high: "获得此数量的浏览后，浏览字段将被显著突出显示。"
+    cold_age_days_low: "经过此天数的对话后，最后一个活动日期稍微变暗。"
+    cold_age_days_medium: "经过此天数的对话后，最后一个活动日期适度变暗。"
+    cold_age_days_high: "经过此天数的对话后，最后一个活动日期显著变暗。"
+    history_hours_low: "在此小时数内编辑过的帖子会略微突出显示编辑指示器"
+    history_hours_medium: "在此小时数内编辑过的帖子会适度突出显示编辑指示器."
+    history_hours_high: "在此小时数内编辑过的帖子会强烈突出显示编辑指示器."
+    topic_post_like_heat_low: "在点赞:帖子比例超过此值后，帖子计数字段会被略微突出显示。"
+    topic_post_like_heat_medium: "在点赞:帖子比例超过此值后，帖子计数字段会被适度突出显示。"
+    topic_post_like_heat_high: "在点赞:帖子比例超过此值后，帖子计数字段会被强烈突出显示。"
+    faq_url: "如果您想使用在别处托管的常见问题解答，请在此处提供完整 URL。"
+    tos_url: "如果您想使用在别处托管的《服务条款》文档，请在此处提供完整 URL。"
+    privacy_policy_url: "如果您想使用在别处托管的《隐私政策》文档，请在此处提供完整 URL。"
+    log_anonymizer_details: "匿名后是否在日志中保留用户的详细信息。要遵守 GDPR，您需要将其关闭。"
+    newuser_spam_host_threshold: "在被视为垃圾信息之前，新用户可以在他们的 `newuser_spam_host_threshold` 帖子中发布指向同一主机的链接的次数。"
+    allowed_spam_host_domains: "从垃圾信息主机测试中排除的网域列表。新用户永远不会被限制创建带有这些网域链接的帖子。"
+    staff_like_weight: "管理人员赞的权重（非管理人员赞的权重为 1）。"
+    topic_view_duration_hours: "每个 IP/用户每 N 小时计算一次新话题浏览"
+    user_profile_view_duration_hours: "每个 IP/用户每 N 小时计算一次新用户个人资料浏览"
+    levenshtein_distance_spammer_emails: "在匹配垃圾信息发布者电子邮件时，仍然允许模糊匹配的字符数差异。"
+    max_new_accounts_per_registration_ip: "如果已经有 (n) 个来自此 IP 的信任级别 0 帐户（并且没有一个是管理人员或者是 TL2 或更高级别），则停止接受来自该 IP 的新注册。"
+    min_ban_entries_for_roll_up: "点击“汇总”按钮时，如果至少有 (N) 个条目，将创建一个子网禁止条目"
+    max_age_unmatched_emails: "在 (N) 天后删除不匹配的已屏蔽电子邮件条目。"
+    max_age_unmatched_ips: "在 (N) 天后删除不匹配的已屏蔽 IP 条目。"
+    num_flaggers_to_close_topic: "自动暂停话题以进行干预所需的最小唯一举报次数"
+    num_hours_to_close_topic: "暂停话题以进行干预的小时数。"
+    auto_respond_to_flag_actions: "处理举报时启用自动回复。"
+    min_first_post_typing_time: "用户在第一次发帖时必须输入的最短时间（以毫秒为单位），如果未达到阈值，发布将自动进入需求审批队列。设置为 0 将禁用（不推荐）"
     auto_silence_fast_typers_on_first_post: "自动禁言未达到 min_first_post_typing_time 的用户"
-    auto_silence_fast_typers_max_trust_level: "自动禁言输入快速的用户的适用信任等级"
-    reviewable_claiming: "是否需要审核可审核的内容才能对其进行操作？"
-    reviewable_default_topics: "默认以话题为分组显示可审核内容"
-    reviewable_default_visibility: "满足此优先级前不要显示可审核条目"
-    high_trust_flaggers_auto_hide_posts: "新用户的发帖被信任等级3+的用户标记为垃圾后将被自动隐藏。"
-    cooldown_hours_until_reflag: "用户需要等待多长时间才能重新标记一个帖子。"
-    reply_by_email_enabled: "启用通过邮件回复。"
-    reply_by_email_address: "通过邮件回复的回复地址模板，例如：%%{reply_key}@reply.example.com 或 replies+%%{reply_key}@example.com"
-    alternative_reply_by_email_addresses: "通过邮件回复的回复地址模板，例如：%%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
-    incoming_email_prefer_html: "传入电子邮件使用HTML而不是文本。"
-    strip_incoming_email_lines: "移除入站邮件每行的首尾空格"
-    disable_emails: "阻止Discourse发送任何类型的电子邮件。 选择“yes”为所有用户禁用邮件。选择“non-staff”仅为非管理人员用户禁用邮件。"
-    strip_images_from_short_emails: "从小于 2800 字节的邮件中剥离图片"
-    short_email_length: "缩短后的邮件长度（Bytes）"
-    display_name_on_email_from: "在邮件的来源中显示全名"
-    unsubscribe_via_email: "允许用户通过发送邮件的方式退订邮件，发送退订邮件可在其标题或正文中包含“unsubscribe”"
-    unsubscribe_via_email_footer: "在发出的邮件底部附上退订链接"
-    delete_email_logs_after_days: "在（N）天后删除邮件日志。设置为 0 无限期保留"
-    disallow_reply_by_email_after_days: "在（N）天后拒绝通过电子邮件回复。0无限期保留"
-    max_emails_per_day_per_user: "每日发送给用户的邮件数量上限。设置为 0 则不限制"
-    enable_staged_users: "处理进站邮件时自动创建暂存用户。"
-    maximum_staged_users_per_email: "处理进站邮件时可创建的最大暂存用户量。"
-    auto_generated_allowlist: "不会进行自动生成内容检查的邮箱地址。例如：foo@bar.com|discourse@bar.com"
-    block_auto_generated_emails: "阻止被检测为自动生成的进站邮件。"
-    ignore_by_title: "根据标题忽略进站邮件。"
-    mailgun_api_key: "用于验证 webhook 消息的 Mailgun Secret API 密钥。"
-    soft_bounce_score: "发生临时拒信时用户被附加的退信分值。"
-    hard_bounce_score: "发生永久拒信时用户被附加的退信分值。"
-    bounce_score_threshold: "停止发送邮件给用户前的最大退信分值。"
-    reset_bounce_score_after_days: "自动在 X 天后重置累计退信分值。"
-    blocked_attachment_content_types: "基于内容类型的关键字屏蔽列表。"
-    blocked_attachment_filenames: "基于文件名的关键句屏蔽列表。"
-    forwarded_emails_behaviour: "如何处理转发给Discourse的电子邮件"
-    always_show_trimmed_content: "总是显示进站邮件中被截断的部分。警告：可能显示某些邮件地址。"
-    trim_incoming_emails: "修剪入站邮件的无关部分"
-    private_email: "不要在邮件标题和主体中包含帖子或话题的内容。注意：会一并关闭摘要邮件。"
-    email_total_attachment_size_limit_kb: "发出的电子邮件附件的最大总大小，单位是 kB。设置为 0 以禁止发送附件。"
-    post_excerpts_in_emails: "在通知邮件中总是发送摘要代替帖子全文。"
-    raw_email_max_length: "应该被保存的入站邮件字符数量。"
-    raw_rejected_email_max_length: "应该被保存的被拒收的入站邮件字符数量。"
-    delete_rejected_email_after_days: "删除（n）天之前被拒收的邮件。"
-    manual_polling_enabled: "用 API 推送邮件回复。"
-    pop3_polling_enabled: "通过 POP3 轮询收取邮件回复。"
-    pop3_polling_ssl: "连接至 POP3 服务器时使用 SSL。（推荐）"
-    pop3_polling_openssl_verify: "验证服务器的 TLS 证书（默认：启用）"
-    pop3_polling_period_mins: "POP3 邮件账户的轮询间隔（以分钟计）。注意：需要重启。"
-    pop3_polling_port: "用于 POP3 轮询账户的端口。"
-    pop3_polling_host: "被 POP3 轮询邮件的主机。"
-    pop3_polling_username: "用于 POP3 轮询邮件的用户名。"
-    pop3_polling_password: "用于 POP3 轮询账户的密码。"
-    pop3_polling_delete_from_server: "从服务器删除电子邮件。注意：如果禁用此功能，则应手动清理邮件收件箱"
-    log_mail_processing_failures: "将所有电子邮件处理失败记录到<a href='%{base_path}/logs'target='_blank'> /logs</a>"
-    email_in: '允许用户通过邮件发表新话题（需要手动或 pop3 轮询）。在每一个分类的“设置”标签页配置地址。'
-    email_in_min_trust: "能通过邮件发表新话题的最低用户信任等级。"
-    email_in_authserv_id: "对收到的电子邮件进行身份验证检查服务的标识符。参见 <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> 了解如何配置它。"
-    email_in_spam_header: "用于检测垃圾邮件的标头。"
-    enable_imap: "启用 IMAP 来同步群组信息。"
-    enable_imap_write: "启用双向 IMAP 同步。如果禁用，则会禁用 IMAP 账户的所有写入操作。"
-    enable_imap_idle: "使用 IMAP IDLE 机制等待新邮件。"
-    enable_smtp: "启用 SMTP 来发送群组消息通知。"
-    imap_polling_period_mins: "检查 IMAP 账户邮件的间隔时间，以分钟为单位。"
-    imap_polling_old_emails: "每次轮询 IMAP 邮箱时，要更新的旧邮件（已处理）的最大数量（全部为 0）。"
-    imap_polling_new_emails: "每次轮询 IMAP 邮箱时，要更新的新邮件（未处理）的最大数量。"
-    imap_batch_import_email: "触发导入模式时新电子邮件的最小数量（禁用发帖警报）。"
-    email_prefix: "邮件标题中使用的 [标签]。留空将默认使用 'title'。"
-    email_site_title: "邮件发送人站点标题。如果没有设置，默认为“title”。如果标题包含了任何不允许的字符，使用这个设置。"
-    find_related_post_with_key: "只能使用 'reply key' 来查找已回复的帖子。警告：禁用此功能将允许用户基于电子邮件地址进行模拟。"
-    minimum_topics_similar: "在编写新话题时，需要有多少相似话题存在？"
-    relative_date_duration: "发表多少天内将显示相对时间（7天）而非绝对时间（2月20日）。"
-    delete_user_max_post_age: "不允许删除第一个帖子发表于(x)天前的用户。"
-    delete_all_posts_max: "通过删除所有帖子按钮可以删除的最大帖子数量。如果用户有比这更多的帖子，这些帖子不能一次性删除并且这个用户不能被删除。"
-    delete_user_self_max_post_count: "用户可以自助删除账户时，最多可拥有的帖子数量。设为 -1 禁用自助删除账户。"
-    username_change_period: "账户注册后可以更改其用户名的最大天数（0表示不允许修改）。"
-    email_editable: "允许用户在注册后改变他们的邮箱地址。"
-    logout_redirect: "注销后将浏览器重定向到（例如：https://example.com/logout）"
-    allow_uploaded_avatars: "允许用户上传自定义个人头像。"
-    default_avatars: "在用户更改头像前的默认头像 URL"
-    automatically_download_gravatars: "为注册或更改邮箱的用户下载 Gravatar 头像。"
-    digest_topics: "邮件摘要中显示热门话题的最大数量。"
-    digest_posts: "邮件摘要中所显示的热门帖子的数量。"
-    digest_other_topics: "邮件摘要中“您所关注的话题和分类中的新内容”这一部分的最大话题数量。"
-    digest_min_excerpt_length: "邮件摘要中显示的帖子摘要字符数下限。"
-    suppress_digest_email_after_days: "停止给(n)天未登录网站的用户发送摘要邮件。"
-    digest_suppress_categories: "从摘要邮件中排除这些分类的内容。"
-    disable_digest_emails: "禁用所有用户摘要邮件功能。"
-    apply_custom_styles_to_digest: "自定义邮件模板和css被应用到摘要邮件。"
-    email_accent_bg_color: "HTML 邮件中用于背景的强调颜色。输入色彩名字（“red”）或十六进制值（“#0000FF”）。"
-    email_accent_fg_color: "HTML 邮件中背景使用的字体颜色。输入色彩名（“white”）或十六进制值（“#FFFFFF”）。"
-    email_link_color: "HTML 邮件中的链接颜色。输入色彩名字（“blue”）或十六进制值（“#0000FF”）。"
-    detect_custom_avatars: "检测用户是否上传了自定义个人头像。"
-    max_daily_gravatar_crawls: "在一天中 Discourse 自动检查 Gravatar 自定义头像的最大次数"
-    public_user_custom_fields: "能被API获取的用户自定义字段列表。"
-    staff_user_custom_fields: "能被管理员使用API获取的用户自定义字段列表。"
-    enable_user_directory: "提供可供浏览的用户目录"
-    enable_group_directory: "提供可供浏览的群组目录"
-    enable_category_group_moderation: "允许群组管理指定分类中的内容"
-    group_in_subject: "在邮件标题中设置%%{optional_pm}，取决于PM中第一个组的名称，请参阅：<a href ='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target ='_blank'>自定义标准邮件的标题格式</a>"
+    auto_silence_fast_typers_max_trust_level: "自动禁言输入过快的用户的最高信任级别"
+    auto_silence_first_post_regex: "检查用户第一个帖子的大小写不相关的正则表达式。如匹配，用户将被禁言并送至审核队列。示例：raging|a[bc]a 将匹配包含 raging、aba 或者 aca 的所有帖子，因此该用户将被禁言。只对第一个帖子有效。已弃用：改用“禁言关注词”。"
+    reviewable_claiming: "可审核的内容是否需要先声明然后再对其采取行动？"
+    reviewable_default_topics: "默认显示按话题分组的可审核内容"
+    reviewable_default_visibility: "除非满足此优先级，否则不显示可审核条目"
+    reviewable_low_priority_threshold: "除非使用 '（任何）' 筛选器，否则优先级筛选器会隐藏不符合此分数的可审核条目。"
+    high_trust_flaggers_auto_hide_posts: "新用户帖子在被 TL3+ 用户举报为垃圾信息后会被自动隐藏"
+    cooldown_hours_until_reflag: "用户需要等待多长时间才能重新举报帖子"
+    slow_mode_prevents_editing: "在 editing_grace_period 之后，“慢速模式”会阻止编辑吗？"
+    reply_by_email_enabled: "启用通过电子邮件回复话题。"
+    reply_by_email_address: "通过传入电子邮件地址回复的模板。示例：%%{reply_key}@reply.example.com 或 replies+%%{reply_key}@example.com"
+    alternative_reply_by_email_addresses: "通过传入电子邮件地址回复的备用模板列表。示例：%%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
+    incoming_email_prefer_html: "对传入电子邮件使用 HTML 而不是文本。"
+    strip_incoming_email_lines: "从传入电子邮件的每一行中移除前导和尾随空格。"
+    disable_emails: "禁止 Discourse 发送任何类型的电子邮件。选择“是”将对所有用户禁用电子邮件。选择“非管理人员”将仅对非管理人员用户禁用电子邮件。"
+    strip_images_from_short_emails: "从大小小于 2800 字节的电子邮件中去除图片"
+    short_email_length: "短电子邮件长度（以字节为单位）"
+    display_name_on_email_from: "在电子邮件发件人字段上显示全名"
+    unsubscribe_via_email: "允许用户通过发送主题或正文中包含 'unsubscribe' 的电子邮件来退订电子邮件"
+    unsubscribe_via_email_footer: "通过已发送电子邮件页脚的电子邮件 mailto: 链接附加退订"
+    delete_email_logs_after_days: "在 (N) 天后删除电子邮件日志。设置为 0 将无限期保留"
+    disallow_reply_by_email_after_days: "禁止在 (N) 天后通过电子邮件回复。设置为 0 将无限期允许"
+    max_emails_per_day_per_user: "每天向用户发送的最大电子邮件数。设置为 0 将禁用限制"
+    enable_staged_users: "处理传入电子邮件时自动创建暂存用户。"
+    maximum_staged_users_per_email: "处理传入电子邮件时创建的最大暂存用户数。"
+    auto_generated_allowlist: "不会检查自动生成内容的电子邮件地址列表。示例：foo@bar.com|discourse@bar.com"
+    block_auto_generated_emails: "阻止识别为自动生成的传入电子邮件。"
+    ignore_by_title: "根据标题忽略传入电子邮件。"
+    mailgun_api_key: "用于验证网络钩子消息的 Mailgun Secret API 密钥。"
+    soft_bounce_score: "发生临时退回时，向用户添加的退回分数。"
+    hard_bounce_score: "发生永久退回时，向用户添加的退回分数。"
+    bounce_score_threshold: "在我们停止向用户发送电子邮件之前的最大退回分数。"
+    reset_bounce_score_after_days: "X 天后自动重置退回分数。"
+    blocked_attachment_content_types: "用于根据内容类型屏蔽附件的关键字列表。"
+    blocked_attachment_filenames: "用于根据文件名屏蔽附件的关键字列表。"
+    forwarded_emails_behaviour: "如何处理转发到 Discourse 的电子邮件"
+    always_show_trimmed_content: "始终显示传入电子邮件被修剪的部分。警告：可能会泄露电子邮件地址。"
+    trim_incoming_emails: "修剪传入电子邮件的不相关部分。"
+    private_email: "不在电子邮件标题或电子邮件正文中包含帖子或话题的内容。注意：还会禁用摘要电子邮件。"
+    email_total_attachment_size_limit_kb: "附加到外发电子邮件的文件的最大总大小（以 kB 为单位）。设置为 0 将禁用附件发送。"
+    post_excerpts_in_emails: "在通知电子邮件中，始终发送摘录而不是完整的帖子"
+    raw_email_max_length: "应为传入电子邮件存储的字符数。"
+    raw_rejected_email_max_length: "应为被拒的传入电子邮件存储的字符数。"
+    delete_rejected_email_after_days: "删除超过 (n) 天的被拒电子邮件。"
+    manual_polling_enabled: "使用 API 推送电子邮件以进行电子邮件回复。"
+    pop3_polling_enabled: "通过 POP3 轮询以进行电子邮件回复。"
+    pop3_polling_ssl: "连接到 POP3 服务器时使用 SSL。（推荐）"
+    pop3_polling_openssl_verify: "验证 TLS 服务器证书（默认：启用）"
+    pop3_polling_period_mins: "检查 POP3 帐户以获取电子邮件之间的时间间隔（以分钟为单位）。注意：需要重新启动。"
+    pop3_polling_port: "用于 POP3 轮询帐户的端口。"
+    pop3_polling_host: "通过 POP3 轮询电子邮件的主机。"
+    pop3_polling_username: "用于轮询电子邮件的 POP3 帐户的用户名。"
+    pop3_polling_password: "用于轮询电子邮件的 POP3 帐户的密码。"
+    pop3_polling_delete_from_server: "从服务器删除电子邮件。注意：如果您禁用此功能，您应该手动清理您的邮件收件箱"
+    log_mail_processing_failures: "将所有电子邮件处理失败记录到 <a href='%{base_path}/logs' target='_blank'>/logs</a>"
+    email_in: '允许用户通过电子邮件发布新话题（需要手动或 pop3 轮询）。在每个类别的“设置”标签页中配置地址。'
+    email_in_min_trust: "用户要被允许通过电子邮件发布新话题所需的最低信任级别。"
+    email_in_authserv_id: "对传入电子邮件进行身份验证检查的服务的标识符。请参阅 <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> 了解配置说明"
+    email_in_spam_header: "用于检测垃圾信息的电子邮件标头。"
+    enable_imap: "启用 IMAP 以同步群组消息。"
+    enable_imap_write: "启用双向 IMAP 同步。如果禁用，IMAP 帐户上的所有写入操作都将被禁用。"
+    enable_imap_idle: "使用 IMAP IDLE 机制等待新电子邮件。"
+    enable_smtp: "启用 SMTP 以发送群组消息通知。"
+    imap_polling_period_mins: "检查 IMAP 帐户有无电子邮件的时间间隔（以分钟为单位）。"
+    imap_polling_old_emails: "每次轮询 IMAP 邮箱时要更新的旧电子邮件（已处理）的最大数量（设为 0 将更新全部）。"
+    imap_polling_new_emails: "每次轮询 IMAP 邮箱时要更新的新电子邮件（已处理）的最大数量。"
+    imap_batch_import_email: "触发导入模式的新电子邮件的最小数量（禁用导入帖子的通知）。"
+    email_prefix: "电子邮件主题中使用的[标签]。如果不设置，将默认为 'title'。"
+    email_site_title: "用作来自站点的电子邮件发件人的站点标头。如果不设置，则默认为 'title'。如果您的 'title' 包含电子邮件发件人字符串中不允许的字符，请使用此设置。"
+    find_related_post_with_key: "仅使用“回复键”查找回复的帖子。警告：禁用此功能将允许基于电子邮件地址的用户模拟。"
+    minimum_topics_similar: "编辑新话题时，在呈现相似话题之前需要存在的话题数。"
+    relative_date_duration: "发帖后发布日期将显示为相对（7 天）而不是绝对（2 月 20 日）的天数。"
+    delete_user_max_post_age: "不允许删除第一个帖子超过 (x) 天的用户。"
+    delete_all_posts_max: "使用“删除所有帖子”按钮可以一次删除的最大帖子数。如果用户的帖子超过此数值，则无法一次全部删除这些帖子，用户也不能被删除。"
+    delete_user_self_max_post_count: "允许自助帐户删除时用户可以拥有的最大帖子数。设置为 -1 将禁用自助帐户删除。"
+    username_change_period: "注册后帐户可以更改其用户名的最大天数（0 表示不允许更改用户名）。"
+    email_editable: "允许用户在注册后更改他们的电子邮件地址。"
+    logout_redirect: "退出后将浏览器重定向到的位置（例如：https://example.com/logout）"
+    allow_uploaded_avatars: "允许用户上传自定义个人资料照片。"
+    default_avatars: "在更改前新用户默认使用的头像的 URL。"
+    automatically_download_gravatars: "在创建帐户或更改电子邮件时为用户下载 Gravatar。"
+    digest_topics: "要在电子邮件摘要中显示的最大热门话题数。"
+    digest_posts: "要在电子邮件摘要中显示的热门帖子的最大数量。"
+    digest_other_topics: "在电子邮件摘要的“您关注的新话题和类别”部分中显示的最大话题数。"
+    digest_min_excerpt_length: "电子邮件摘要中的最少帖子摘录，以字符为单位。"
+    suppress_digest_email_after_days: "禁止向超过 (n) 天未在网站上看到的用户发送摘要电子邮件。"
+    digest_suppress_categories: "从摘要电子邮件中禁止这些类别。"
+    disable_digest_emails: "禁用所有用户的摘要电子邮件。"
+    apply_custom_styles_to_digest: "自定义电子邮件模板和 CSS 应用于摘要电子邮件。"
+    email_accent_bg_color: "用作 HTML 电子邮件中某些元素背景的强调色。输入颜色名称 ('red') 或十六进制值 ('#FF0000')。"
+    email_accent_fg_color: "HTML 电子邮件中电子邮件背景颜色上呈现的文本颜色。输入颜色名称 ('white') 或十六进制值 ('#FFFFFF')。"
+    email_link_color: "HTML 电子邮件中链接的颜色。输入颜色名称 ('blue') 或十六进制值 ('#0000FF')。"
+    detect_custom_avatars: "是否检查用户已上传自定义个人资料照片。"
+    max_daily_gravatar_crawls: "Discourse 在一天内检查 Gravatar 以获取自定义头像的最大次数"
+    public_user_custom_fields: "可以使用 API 检索的用户自定义字段列表。"
+    staff_user_custom_fields: "可以使用 API 为管理人员检索的用户自定义字段列表。"
+    enable_user_directory: "提供用户目录以供浏览"
+    enable_group_directory: "提供群组目录以供浏览"
+    enable_category_group_moderation: "允许群组审核特定类别的内容"
+    group_in_subject: "在电子邮件主题中将 %%{optional_pm} 设置为 PM 中第一个群组的名称，请参阅：<a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>自定义标准电子邮件的主题格式</a>"
     allow_anonymous_posting: "允许用户切换至匿名模式"
-    anonymous_posting_min_trust_level: "启用匿名发帖所需的最低信任等级"
-    anonymous_account_duration_minutes: "为了确保匿名性，每N分钟为各个用户创建一个新的匿名账户。例如：如果设置为600，只要自最后发帖起过去了600分钟，并且用户切换至匿名模式，就会创建一个新的匿名账户。"
-    hide_user_profiles_from_public: "为匿名用户禁用用户信息卡、用户资料和用户目录。"
-    allow_users_to_hide_profile: "允许用户隐藏其个人资料和状态"
-    allow_featured_topic_on_user_profiles: "允许用户在其用户卡片和个人资料上显示一个指向话题的链接。"
-    show_inactive_accounts: "允许已登录用户查看不活跃账户。"
-    hide_suspension_reasons: "不在用户页面公开显示封禁原因。"
-    log_personal_messages_views: "管理员记录其他用户或群组的私信浏览数。"
-    ignored_users_count_message_threshold: "当一个用户被n个用户忽视时通知版主。"
-    ignored_users_message_gap_days: "当一个用户被多个用户忽视时，再次通知版主前需要等待多少天。"
-    clean_up_inactive_users_after_days: "非活跃用户（信任等级0且没有任何帖子）被删除前等待的天数。设为0则关闭清理。"
-    clean_up_unused_staged_users_after_days: "删除未使用过的暂存用户（无任何帖子）之前等待的天数。设为0则关闭清理。"
-    user_selected_primary_groups: "允许用户设置其主要群组"
-    max_notifications_per_user: "每个用户最大的通知数量，如超出，旧的通知将被删除。每周都会执行。设为0以关闭。"
-    allowed_user_website_domains: "用户的网站需在这些域名之中。使用管道符号分割的列表。"
-    allow_profile_backgrounds: "允许用户上传个人资料背景图片。"
-    sequential_replies_threshold: "在被提醒过多连续的回复前，用户在话题中可以连续回复的帖子数量。"
-    get_a_room_threshold: "用户被警告前，可在同一个话题下向同一个人回帖的数量。"
-    enable_mobile_theme: "为移动设备启用移动友好的主题，但也能切换回完整站点。如果您想要使用自定义的响应式主题请禁用它。"
-    dominating_topic_minimum_percent: "被提醒过度干预一个话题前，单个用户发帖可占整个话题的百分比。"
-    disable_avatar_education_message: "禁用更改头像操作的教育私信。"
-    suppress_uncategorized_badge: "话题列表中的未分类话题不要显示徽章。"
-    header_dropdown_category_count: "标题下拉菜单可显示多少分类。"
-    permalink_normalizations: "在匹配永久链接之前应用如下正则表达式，例如：/(topic.*)\\?.*/\\1 将去掉所有话题路径的查询字符串。格式为使用正则表达式+使用 \\1 等字符串来访问捕获内容"
-    global_notice: "为所有访客显示紧急的、重要的和不可忽略的全局横幅公告，修改为空以隐藏（可使用HTML）。"
+    anonymous_posting_min_trust_level: "启用匿名发帖所需的最低信任级别"
+    anonymous_account_duration_minutes: "为了保护匿名性，每 N 分钟为每个用户创建一个新的匿名帐户。示例：如果设置为 600，则在距离上次发帖 600 分钟且用户切换到匿名时，将创建一个新的匿名帐户。"
+    hide_user_profiles_from_public: "禁用匿名用户的用户卡片、用户个人资料和用户目录。"
+    allow_users_to_hide_profile: "允许用户隐藏他们的个人资料和状态"
+    allow_featured_topic_on_user_profiles: "允许用户在他们的用户卡片和个人资料上添加指向某个话题的链接。"
+    show_inactive_accounts: "允许登录用户浏览闲置帐户的个人资料。"
+    hide_suspension_reasons: "不在用户个人资料中公开显示封禁原因。"
+    log_personal_messages_views: "管理员为其他用户/群组记录个人消息浏览。"
+    ignored_users_count_message_threshold: "如果某个特定用户被此数量的其他用户忽略，则通知版主。"
+    ignored_users_message_gap_days: "当一个用户被多个用户忽略时，再次通知版主前需要等待的天数。"
+    clean_up_inactive_users_after_days: "停用用户（信任级别为 0 且没有任何帖子）被移除前的等待天数。设为 0 将禁用清理。"
+    clean_up_unused_staged_users_after_days: "未使用的暂存用户（没有任何帖子）被移除前的等待天数。设为 0 将禁用清理。"
+    user_selected_primary_groups: "允许用户设置自己的主要群组"
+    max_notifications_per_user: "每个用户的最大通知数量，如果超过此数值，旧通知将被删除。每周强制执行。设置为 0 将禁用"
+    allowed_user_website_domains: "用户网站将针对这些网域进行验证。| 分隔列表。"
+    allow_profile_backgrounds: "允许用户上传个人资料背景。"
+    sequential_replies_threshold: "在被提醒太多连续回复之前，用户必须在话题中连续发布的帖子数。"
+    get_a_room_threshold: "在被警告之前，用户必须在同一话题中向同一个人发布的帖子数。"
+    enable_mobile_theme: "移动设备使用适合移动设备的主题，并且可以切换到完整站点。如果您想使用完全自适应的自定义样式表，请禁用此选项。"
+    dominating_topic_minimum_percent: "在被提醒过度主导某个话题之前，用户必须在某个话题中发布的帖子所占的百分比。"
+    disable_avatar_education_message: "禁用更改头像的教育消息。"
+    suppress_uncategorized_badge: "不在话题列表中显示未分类话题的徽章。"
+    header_dropdown_category_count: "标题下拉菜单中可以显示的类别数量。"
+    permalink_normalizations: "在匹配永久链接之前应用以下正则表达式，例如：/(topic.*)\\?.*/\\1 将从话题路由中去除查询字符串。格式为正则表达式+字符串。使用 \\1 等访问捕获"
+    global_notice: "向所有访客显示紧急、突发、不可关闭的全局横幅通知，更改为空将隐藏（允许使用 HTML）。"
     disable_system_edit_notifications: "当 'download_remote_images_to_local' 启用时禁用系统用户的编辑提醒。"
-    notification_consolidation_threshold: "合并通知前，可收到的“赞”和“成员请求”通知的数量。设置为0则禁用。"
-    likes_notification_consolidation_window_mins: "以分钟计的持续时间，被赞的通知在达到此阈值前会被合并到单个通知中。阈值可以通过 `SiteSetting.notification_consolidation_threshold` 进行配置。"
-    automatically_unpin_topics: "当用户到达底部时自动解除话题置顶。"
+    notification_consolidation_threshold: "合并通知前，收到的赞或成员资格请求通知的数量。设置为 0 将禁用。"
+    likes_notification_consolidation_window_mins: "以分钟计的持续时间，被赞的通知在达到此阈值后会被合并到单个通知中。可以通过 `SiteSetting.notification_consolidation_threshold` 配置阈值。"
+    automatically_unpin_topics: "当用户到达底部时自动取消置顶话题。"
     read_time_word_count: "每分钟可阅读的字数，用于估算阅读时间。"
-    topic_page_title_includes_category: "话题页面<a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>标题标签</a>包含分类名称。"
-    native_app_install_banner_ios: "在iOS设备上为普通用户（信任等级1及以上）显示 DiscourseHub 应用的横幅。"
-    native_app_install_banner_android: "在Android设备上为普通用户（信任等级1及以上）显示 DiscourseHub 应用的横幅。"
-    app_association_android: "端点 <a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a> 的内容，用于谷歌的数字资产链接 API。"
-    app_association_ios: "端点<a href='%{base_path}/apple-app-site-association'>apple-app-site-association </a> 的内容，用于在创建该站点和 iOS 应用程序之间通用链接。"
-    share_anonymized_statistics: "分享匿名化的使用数据。"
-    auto_handle_queued_age: "此设定天数后自动处理待审核的记录。标记将被忽略。队列中的帖子及用户将被拒绝。设为 0 将禁用此功能。"
-    svg_icon_subset: "添加您希望包含在资产中的其它FontAwesome 5图标。使用前缀'fa-'表示实心图标，'far-'表示常规图标，'fab-'表示品牌图标。"
-    max_prints_per_hour_per_user: "/print 页面的每小时最大展示量（设置为 0 禁用）"
-    full_name_required: "全名是用户个人信息的必填项。"
-    enable_names: "在用户的个人信息、用户卡片和邮件中显示全名。禁用以在所有地方隐藏全名。"
-    display_name_on_posts: "在用户的帖子中显示他们的全名以及他们的 @username。"
-    show_time_gap_days: "两个帖子的发表时间相隔多少天内时，在话题中以时间间隔显示。"
-    short_progress_text_threshold: "在话题中的帖子数超过这个数量后，进度条将只显示当前的帖子数量。如果您更改了进度条的宽度，您需要修改这个值。"
-    default_code_lang: "使用Github code block(auto, nohighlight, ruby, python etc)作为默认的编程语言语法高亮。"
-    warn_reviving_old_topic_age: "当有人开始回复一个最后回复于设定天数之前的话题时，将显示一个警告。将其设置为 0 以禁用。"
-    autohighlight_all_code: "即使未显式声明语言，仍为所有预格式化代码块应用语法高亮。"
-    highlighted_languages: "包含语法突出显示规则。（警告：包含太多语言可能会影响性能）请参阅：<a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a>用于演示"
-    show_copy_button_on_codeblocks: "为代码块添加复制到用户剪切板的按钮。该功能不支持IE浏览器。"
-    embed_any_origin: "允许嵌入任意来源的内容。这对于带有静态 HTML 的移动应用程序是必需的。"
-    embed_topics_list: "话题列表支持HTML嵌入"
-    embed_set_canonical_url: "为嵌入到话题的内容设置规范 URL。"
+    topic_page_title_includes_category: "话题页面<a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>标题标签</a>包含类别名称。"
+    native_app_install_banner_ios: "在 iOS 设备上向普通用户（信任级别为 1 及以上）显示 DiscourseHub 应用横幅。"
+    native_app_install_banner_android: "在 Android 设备上向普通用户（信任级别为 1 及以上）显示 DisroseHUB 应用横幅。"
+    app_association_android: "端点 <a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a> 的内容，用于 Google 的 Digital Asset Links API。"
+    app_association_ios: "端点 <a href='%{base_path}/apple-app-site-association'>apple-app-site-association </a> 的内容，用于在创建此站点与 iOS 应用之间通用链接。"
+    share_anonymized_statistics: "共享匿名使用统计信息。"
+    auto_handle_queued_age: "在此设定天数后自动处理待审核的记录。举报将被忽略。队列中的帖子和用户将被拒绝。设为 0 将禁用此功能。"
+    penalty_step_hours: "以小时为单位对用户进行禁言或封禁的默认处罚。第一次违反默认为第一个值，第二次违反默认为第二个值，依此类推。"
+    svg_icon_subset: "添加您希望包含在资产中的其他 FontAwesome 5 图标。使用前缀 'fa-' 表示实心图标，使用 far-' 表示常规图标，使用 'fab-' 表示品牌图标。"
+    max_prints_per_hour_per_user: "/print 页面的最大展示次数（设置为 0 将禁用）"
+    full_name_required: "全名是用户个人资料的必填字段。"
+    enable_names: "在用户的个人资料、用户卡片和电子邮件中显示用户的全名。禁用将在所有地方隐藏全名。"
+    display_name_on_posts: "在帖子中显示用户的全名以及他们的用户名。"
+    show_time_gap_days: "如果两个帖子间隔此天数，在话题中显示时间间隔。"
+    short_progress_text_threshold: "当一个话题的帖子数量超过此数值后，进度条将只显示当前帖子数量。如果更改进度条的宽度，则可能需要更改此值。"
+    default_code_lang: "应用于 GitHub 代码块的默认编程语言语法高亮显示（auto、nohighlight、ruby、python 等）"
+    warn_reviving_old_topic_age: "当有人开始回复上次回复时间超过此天数的话题时，将显示警告。设置为 0 将禁用。"
+    autohighlight_all_code: "即使未显式声明语言，也强制向所有预格式化代码块应用代码高亮显示。"
+    highlighted_languages: "包括语法高亮显示规则。（警告：包含太多语言可能会影响性能）请参阅：<a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a> 查看演示"
+    show_copy_button_on_codeblocks: "向代码块添加按钮以将块内容复制到用户的剪贴板。Internet Explorer 不支持此功能。"
+    embed_any_origin: "允许嵌入任意来源的内容。这对于带有静态 HTML 的移动应用是必需的。"
+    embed_topics_list: "支持话题列表的 HTML 嵌入"
+    embed_set_canonical_url: "将嵌入话题的规范 URL 设置为嵌入内容的 URL。"
     embed_truncate: "截断嵌入的帖子。"
-    embed_unlisted: "直到一个用户回复前，导入的话题不会被列出。"
-    embed_support_markdown: "为嵌入式帖子支持Markdown格式。"
-    allowed_embed_selectors: "允许嵌入的CSS元素列表，使用逗号分割。"
-    allowed_href_schemes: "除了 http 和 https 外允许的链接协议。"
-    embed_post_limit: "嵌入帖子的最大数量。"
+    embed_unlisted: "在用户回复前，导入的话题将不会被取消公开。"
+    embed_support_markdown: "支持嵌入帖子的 Markdown 格式。"
+    allowed_embed_selectors: "嵌入中允许的 CSS 元素的逗号分隔列表。"
+    allowed_href_schemes: "除了 http 和 https 之外，链接中允许的协议名称。"
+    embed_post_limit: "要嵌入的最大帖子数。"
     embed_username_required: "创建话题需要用户名。"
-    notify_about_flags_after: "如果在这么多小时后仍有标记未处理，请向版主发送个人信息。设置为0以禁用。"
-    show_create_topics_notice: "如果站点只有少于 5 篇的公开帖子时，显示一条请管理员创建帖子的提示。"
-    delete_drafts_older_than_n_days: "删除超过 n 天的草稿。"
-    bootstrap_mode_min_users: "禁用摘要模式的用户数下限（0 为禁用）。"
+    notify_about_flags_after: "如果经过此小时数后仍有未处理的举报，向版主发送个人信息。设置为 0 将禁用。"
+    show_create_topics_notice: "如果站点的公共话题少于 5 个，请显示通知，要求管理员创建一些话题。"
+    delete_drafts_older_than_n_days: "删除超过 (n) 天的草稿。"
+    delete_merged_stub_topics_after_days: "在自动删除完全合并的存根话题之前等待的天数。设置为 0 将从不删除存根话题。"
+    bootstrap_mode_min_users: "禁用引导模式所需的最小用户数（设置为 0 将禁用）"
     prevent_anons_from_downloading_files: "阻止匿名用户下载附件。"
-    secure_media: '限制所有上传文件（图像、视频、音频、文本、可移植文档格式（pdf）、压缩文件等）的访问。如启用“login required”，那么只有已登录的用户才可以访问上传的文件。否则只对私信和私有分类中的媒体上传进行限制。注意：此设置很复杂且需要深入的管理认识。更详细的内容参阅<a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">官方论坛中的媒体安全话题</a>。'
-    secure_media_allow_embed_images_in_emails: "如果图像小于‘secure media max email embed image size kb’的设置，则允许通过邮件编辑嵌入安全的图像。"
-    secure_media_max_email_embed_image_size_kb: "如果启用了‘secure media allow embed in emails’设置，限制大小之内的安全图像将被嵌入到邮件；如无启用，则本设置无效。"
-    slug_generation_method: "选择一个链接生成方式。“encoded”将生成以百分号编码的链接。“none”将禁用自定义链接，只生成默认链接。"
-    enable_emoji: "启用绘文字（emoji）"
-    enable_emoji_shortcuts: "常见的笑脸文字如 :) :p :( 将被转换为绘文字"
-    emoji_set: "您喜欢哪一种 emoji？"
+    secure_media: '限制对所有上传（图片、视频、音频、文本、pdf、zip 等）的访问。如果启用“需要登录”，则只有登录用户才能访问上传。否则，访问将仅限于私信和不公开类别中的媒体上传。警告：此设置比较复杂，需要深入理解管理操作。请参阅 <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">Meta 安全媒体话题</a>以了解详情。'
+    secure_media_allow_embed_images_in_emails: "如果小于 'secure media max email embed image size kb' 设置，则允许嵌入通常会在电子邮件中编辑的安全图片。"
+    secure_media_max_email_embed_image_size_kb: "如果启用了 'secure media allow embed in emails' 设置，将被嵌入到电子邮件的安全图片的大小限制；如果不启用，则此设置无效。"
+    slug_generation_method: "选择一种缩略名生成方法。'encoded' 将生成百分比编码字符串。'none' 将完全禁用缩略名。"
+    enable_emoji: "启用表情符号"
+    enable_emoji_shortcuts: "常见的笑脸文字（如 :) :p :(）将被转换为表情符号"
+    emoji_set: "您喜欢表情符号吗？"
     emoji_autocomplete_min_chars: "触发自动填充表情符号弹出窗口所需的最少字符数"
-    enable_inline_emoji_translation: "启用行内表情符号解析（之前没有任何空格或标点）"
-    approve_post_count: "新用户或基础用户需要被审核的帖子数量"
-    approve_unless_trust_level: "该信任等级之下的用户的帖子必须被审核"
-    approve_new_topics_unless_trust_level: "低于该信任等级的用户的新帖子需要被审核"
-    approve_unless_staged: "必须批准暂存用户的新话题和帖子"
-    notify_about_queued_posts_after: "如果有帖子等待了这些小时后仍未处理，给所有版主发送通知。设置为0禁用这些通知。"
-    auto_close_messages_post_count: "私信中贴子数上限，达到后自动关闭私信（0 为禁用）"
-    auto_close_topics_post_count: "话题中贴子数上限，达到后自动关闭话题 ( 0 为禁用 )"
-    auto_close_topics_create_linked_topic: "根据 “话题中贴子数上限” 设置自动关闭话题后，创建一个新的链接话题"
-    code_formatting_style: "编辑器中的代码格式化按钮设置的默认格式"
-    max_allowed_message_recipients: "私信允许的最大收件人数。"
-    watched_words_regular_expressions: "监视词是正则表达式。"
-    enable_diffhtml_preview: "实验性功能，使用diffHTML实现同步预览（sync preview）代替完全重新渲染（full re-render）"
-    old_post_notice_days: "提醒帖子成为存档前的天数"
-    new_user_notice_tl: "查看新用户发帖通知所需的最低信任级别。"
-    returning_user_notice_tl: "查看回归用户发帖通知所需的最低信任级别。"
-    returning_users_days: "在用户被认为回归之前应该经过多少天。"
-    review_media_unless_trust_level: "工作人员将会审核信任等级较低的用户所发布含有嵌入多媒体的内容。"
-    blur_tl0_flagged_posts_media: "模糊标记帖子图像以隐藏潜在的 NSFW 内容。"
-    enable_page_publishing: "允许工作人员使用自定义样式话题将话题发布到新的链接。"
-    show_published_pages_login_required: "即使要求登录，匿名用户也可以查看公开的页面。"
-    skip_auto_delete_reply_likes: "当自动删除旧回复时，不删除多于或等于此赞数的帖子。"
-    default_email_digest_frequency: "用户收到摘要邮件的默认频率。"
-    default_include_tl0_in_digests: "在摘要邮件中默认包含新用户帖子。用户可以自行在参数设置中更改这个设置。"
+    enable_inline_emoji_translation: "启用内联表情符号的翻译（之前没有任何空格或标点符号）"
+    approve_post_count: "新用户或基本用户必须接受审批的帖子数量"
+    approve_unless_trust_level: "低于此信任级别的用户的帖子必须接受审批"
+    approve_new_topics_unless_trust_level: "低于此信任级别的用户的新话题必须接受审批"
+    approve_unless_staged: "暂存用户的新话题和帖子必须接受审批"
+    notify_about_queued_posts_after: "如果有帖子等待审核的小时超过此数值，向所有版主发送通知。设置为 0 将禁用这些通知。"
+    auto_close_messages_post_count: "消息被自动关闭前允许的最大帖子数（设置为 0 将禁用）"
+    auto_close_topics_post_count: "话题被自动关闭前允许的最大帖子数（设置为 0 将禁用）"
+    auto_close_topics_create_linked_topic: "在话题根据 'auto close topics post count' 设置被自动关闭后，创建一个新的链接话题"
+    code_formatting_style: "编辑器中的代码按钮将默认为此代码格式样式"
+    max_allowed_message_recipients: "消息中允许的最大收件人数。"
+    watched_words_regular_expressions: "关注词是正则表达式。"
+    enable_diffhtml_preview: "使用 diffHTML 同步预览而不是完全重新呈现的实验性功能"
+    old_post_notice_days: "帖子通知变旧前的天数"
+    new_user_notice_tl: "查看新用户帖子通知所需的最低信任级别。"
+    returning_user_notice_tl: "查看回访用户帖子通知所需的最低信任级别。"
+    returning_users_days: "在用户被视为回访之前应经过的天数。"
+    review_media_unless_trust_level: "如果包含嵌入式媒体，管理人员将审核信任级别较低的用户的帖子。"
+    blur_tl0_flagged_posts_media: "模糊被举报的帖子图片以隐藏潜在的 NSFW 内容。"
+    enable_page_publishing: "允许管理人员使用自己的样式将话题发布到新 URL。"
+    show_published_pages_login_required: "即使需要登录，匿名用户也可以查看已发布的页面。"
+    skip_auto_delete_reply_likes: "自动删除旧回复时，跳过删除赞数达到或超过此数值的帖子。"
+    default_email_digest_frequency: "用户默认收到摘要电子邮件的频率。"
+    default_include_tl0_in_digests: "在摘要电子邮件中默认包含来自新用户的帖子。用户可以在他们的偏好设置中更改此设置。"
     default_email_level: "设置常规话题的默认电子邮件通知级别。"
-    default_email_messages_level: "设置当有人发消息给用户时的默认邮件提醒等级"
-    default_email_mailing_list_mode: "默认为每一个新帖子发送一封邮件通知。"
-    default_email_mailing_list_mode_frequency: "邮件列表模式下，用户收到邮件的默认频率。"
-    disable_mailing_list_mode: "禁止用户使用邮件列表模式（禁止发送任何邮件列表的电子邮件。）"
-    default_email_previous_replies: "默认在邮件中包含之前的回复。"
-    default_email_in_reply_to: "默认在邮件中包含回复的摘要文本。"
-    default_other_new_topic_duration_minutes: "将话题视为新话题的全局默认条件"
-    default_other_auto_track_topics_after_msecs: "话题被自动设为跟踪的全局默认时间"
-    default_other_notification_level_when_replying: "用户回复话题时的全局默认通知等级"
-    default_other_external_links_in_new_tab: "默认在新的标签页打开外部链接"
-    default_other_enable_quoting: "默认在高亮选择文字时启用引用回复"
-    default_other_enable_defer: "默认启用延迟话题功能"
-    default_other_dynamic_favicon: "默认在浏览器图标上显示新/更新的话题数量"
-    default_other_skip_new_user_tips: "跳过新用户的流程提示和徽章。"
-    default_other_like_notification_frequency: "默认通知被赞的用户"
-    default_topics_automatic_unpin: "默认时当用户到达底部时自动解除话题置顶。"
-    default_categories_watching: "默认关注的分类列表。"
-    default_categories_tracking: "默认跟踪的分类列表。"
-    default_categories_muted: "默认静音的分类列表"
-    default_categories_watching_first_post: "默认关注该分类中每个新话题的第一个帖子"
-    default_categories_regular: "默认为非静音状态的分类列表。作用于站点设置`mute_all_categories_by_default`被启用的时候。"
-    mute_all_categories_by_default: "将所有分类的默认通知级别设置为静音。要求用户选择在“最新”和“分类”页面中出现的分类。如果您希望修改匿名用户的默认设置，请设置 'default_categories_'。"
+    default_email_messages_level: "设置有人发消息给用户时的默认电子邮件通知级别"
+    default_email_mailing_list_mode: "默认为每篇新帖子发送一封电子邮件。"
+    default_email_mailing_list_mode_frequency: "启用邮寄名单模式的用户默认将以频率收到电子邮件。"
+    disable_mailing_list_mode: "禁止用户启用邮寄名单模式（阻止发送任何邮寄名单电子邮件。）"
+    default_email_previous_replies: "在电子邮件中默认包含以前的回复。"
+    default_email_in_reply_to: "在电子邮件中默认包含帖子回复节选。"
+    default_other_new_topic_duration_minutes: "话题被视为新话题的全局默认条件。"
+    default_other_auto_track_topics_after_msecs: "话题在被自动跟踪之前的全局默认时间。"
+    default_other_notification_level_when_replying: "用户回复话题时的全局默认通知级别。"
+    default_other_external_links_in_new_tab: "默认在新标签页中打开外部链接。"
+    default_other_enable_quoting: "默认启用高亮显示文本的引用回复。"
+    default_other_enable_defer: "默认启用延迟话题功能。"
+    default_other_dynamic_favicon: "在浏览器图标上默认显示新的/更新的话题计数。"
+    default_other_skip_new_user_tips: "跳过新用户入门提示和徽章。"
+    default_other_like_notification_frequency: "默认通知用户获得赞"
+    default_topics_automatic_unpin: "当用户到达底部时默认自动取消置顶话题。"
+    default_categories_watching: "默认关注的类别列表。"
+    default_categories_tracking: "默认跟踪的类别列表。"
+    default_categories_muted: "默认被设为免打扰的类别列表。"
+    default_categories_watching_first_post: "默认将关注每个新话题中的第一个帖子的类别列表。"
+    default_categories_regular: "默认未被设为免打扰的类别列表。启用 `mute_all_categories_by_default` 站点设置时很有用。"
+    mute_all_categories_by_default: "将所有类别的默认通知级别设置为免打扰。要求用户选择加入类别，以便他们出现在“最新”和“类别”页面中。如果您希望修改匿名用户的默认设置，请设置 'default_categories_' 设置。"
     default_tags_watching: "默认关注的标签列表。"
-    default_tags_tracking: "默认追踪的标签列表。"
-    default_tags_muted: "默认静音的标签列表。"
-    default_tags_watching_first_post: "关注话题首个回复的标签列表。"
+    default_tags_tracking: "默认跟踪的标签列表。"
+    default_tags_muted: "默认被设为免打扰的标签列表。"
+    default_tags_watching_first_post: "默认将关注每个新话题中的第一个帖子的标签列表。"
     default_text_size: "默认选择的文本大小"
-    default_title_count_mode: "页面标题计算器的默认模式"
-    retain_web_hook_events_period_days: "保存 web hook 事件记录的天数。"
-    retry_web_hook_events: "自动重试失败的Web挂钩事件4次。重试之间的时间间隔为1，5，25和125分钟。"
-    revoke_api_keys_days: "未使用的 API 密钥自动撤销前的等待天数（0 表示从不自动撤销）"
-    allow_user_api_keys: "允许生成用户API密钥"
-    allow_user_api_key_scopes: "用户API授权范围列表"
-    min_trust_level_for_user_api_key: "生成用户 API 密钥所需的信任等级"
-    allowed_user_api_auth_redirects: "允许用户API密钥认证跳转URL。可以使用通配符*匹配任何部分（例如：www.example.com/*)。"
-    allowed_user_api_push_urls: "允许使用服务器推送至用户 API 的 URL"
-    expire_user_api_keys_days: "用户API密钥自动过期前的天数（0表示从不）"
-    tagging_enabled: "启用标签功能，允许为话题设置标签？"
-    min_trust_to_create_tag: "创建标签所需的最小信任等级。"
-    max_tags_per_topic: "话题最多允许有多少个标签。"
-    max_tag_length: "标签允许的最大字符数。"
-    max_tag_search_results: "当搜索标签时，显示的结果数上限。"
-    max_tags_in_filter_list: "过滤菜单中显示的标签数上限。优先显示最常用的标签。"
+    default_title_count_mode: "页面标题计数器的默认模式"
+    retain_web_hook_events_period_days: "保留网络钩子事件记录的天数。"
+    retry_web_hook_events: "自动重试失败的网络钩子事件 4 次。重试之间的时间间隔为 1、5、25 和 125 分钟。"
+    revoke_api_keys_days: "未使用的 API 密钥被自动撤消前的天数（0 表示从不撤消）"
+    allow_user_api_keys: "允许生成用户 API 密钥"
+    allow_user_api_key_scopes: "用户 API 密钥允许的范围列表"
+    min_trust_level_for_user_api_key: "生成用户 API 密钥所需的信任级别"
+    allowed_user_api_auth_redirects: "用户 API 密钥身份验证重定向的允许 URL。通配符 * 可用于匹配它的任何部分（例如 www.example.com/*）。"
+    allowed_user_api_push_urls: "服务器推送到用户 API 的允许 URL"
+    expire_user_api_keys_days: "用户 API 密钥自动过期前的天数（0 表示从不过期）"
+    tagging_enabled: "在话题上启用标签？"
+    min_trust_to_create_tag: "创建标签所需的最低信任级别。"
+    max_tags_per_topic: "可应用于话题的最大标签数。"
+    max_tag_length: "可以在标签中使用的最大字符数。"
+    max_tag_search_results: "搜索标签时，要显示的最大结果数。"
+    max_tags_in_filter_list: "要在筛选器下拉列表中显示的最大标签数。将显示最常用的标签。"
     tags_sort_alphabetically: "按照字母顺序显示标签。默认按流行度显示。"
-    tags_listed_by_group: "按照<a href='%{base_path}/tags' target='_blank'>标签页</a>上的标签组列出标签。"
-    tag_style: "标签的视觉样式。"
-    allow_staff_to_tag_pms: "允许管理人员对私信打标签"
-    min_trust_level_to_tag_topics: "给话题加标签的最小信任等级"
-    suppress_overlapping_tags_in_list: "如果标签匹配了话题标题中的词，不显示该标签"
-    remove_muted_tags_from_latest: "在最新话题列表中，不显示仅有静音标签的话题。"
+    tags_listed_by_group: "在<a href='%{base_path}/tags' target='_blank'>标签页面</a>上按标签组列出标签。"
+    tag_style: "标签徽章的视觉样式。"
+    allow_staff_to_tag_pms: "允许管理人员为任何个人消息添加标签"
+    min_trust_level_to_tag_topics: "为话题添加标签所需的最低信任级别"
+    suppress_overlapping_tags_in_list: "如果标签与话题标题中的字词完全匹配，则不显示标签"
+    remove_muted_tags_from_latest: "不在最新话题列表中显示仅使用已被设为免打扰的标签标记的话题。"
     force_lowercase_tags: "强制所有新标签完全小写。"
-    company_name: "公司名"
+    company_name: "公司名称"
     governing_law: "适用法律"
     city_for_disputes: "争议之城"
-    shared_drafts_category: "为话题草稿指定分类以启用共享草稿功能。此分类中的话题将从管理人员的话题列表中删除。"
+    shared_drafts_category: "通过为话题草稿指定类别来启用共享草稿功能。此类别中的话题将在管理人员用户的话题列表中被禁止。"
     shared_drafts_min_trust_level: "允许用户查看和编辑共享草稿。"
     push_notifications_prompt: "显示用户同意提示。"
-    push_notifications_icon: "在通知中所使用的图标。推荐使用一个96×96的单色且为透明背景的PNG图像。"
-    base_font: "网站标题使用的字体。主题可以通过 `--heading-font-family` CSS 自定义属性来覆盖。"
-    heading_font: "网站标题使用的字体。主题可以通过 `--heading-font-family` CSS 自定义属性来覆盖。"
-    short_title: "短标题将用于用户主页、启动器或其他可能空间有限的地方。应该控制在12个字符内。"
-    dashboard_hidden_reports: "允许从仪表盘中隐藏指定的报告。"
-    dashboard_visible_tabs: "选择可见的仪表盘标签页"
-    dashboard_general_tab_activity_metrics: "选择在常规选项卡中显示为活动指标的报告。"
-    gravatar_name: "Gravatar提供商的名称"
-    gravatar_base_url: "Gravatar提供商API的基础链接"
-    gravatar_login_url: "供用户登录到 Gravatar 服务，基于 gravatar_base_url 的相对链接"
-    share_quote_buttons: "确定分享对话框中出现的按钮及其显示顺序。"
-    share_quote_visibility: "确定何时显示引用分享按钮：从不，仅匿名用户或所有用户。 "
-    create_revision_on_bulk_topic_moves: "当话题批量移动到新类别时，为第一篇帖子创建修订版本。"
+    push_notifications_icon: "出现在通知角的徽章图标。建议使用具有透明度的 96×96 单色 PNG。"
+    base_font: "用于网站上大多数文本的基字体。可以通过 `--font-family` CSS 自定义属性替换主题。"
+    heading_font: "用于网站标题的字体。可以通过 `--heading-font-family` CSS 自定义属性替换主题。"
+    short_title: "短标题将用于用户的主屏幕、启动器或其他空间可能有限的地方。应被限制为 12 个字符。"
+    dashboard_hidden_reports: "允许从信息中心隐藏指定报告。"
+    dashboard_visible_tabs: "选择可见的信息中心标签页。"
+    dashboard_general_tab_activity_metrics: "选择要在“常规”标签页上显示为活动指标的报告。"
+    gravatar_name: "Gravatar 提供程序的名称"
+    gravatar_base_url: "Gravatar 提供程序的 API 库的 URL"
+    gravatar_login_url: "相对于 gravatar_base_url 的 URL，让用户可以登录 Gravatar 服务"
+    share_quote_buttons: "确定引用分享微件中显示的条目以及显示顺序。"
+    share_quote_visibility: "确定何时显示引用分享按钮：从不、仅匿名用户或所有用户。"
+    create_revision_on_bulk_topic_moves: "当话题被批量移入新类别时，为第一个帖子创建修订。"
+    allow_changing_staged_user_tracking: "允许管理员用户更改暂存用户的类别和标签通知偏好设置。"
     errors:
-      invalid_email: "电子邮箱地址无效。"
-      invalid_username: "没有这个用户名的用户。"
-      invalid_group: "没有这个名字的群组。"
-      invalid_integer_min_max: "值必须在 %{min} 和 %{max} 的范围内。"
+      invalid_email: "无效的电子邮件地址。"
+      invalid_username: "没有使用该用户名的用户。"
+      invalid_group: "没有使用该名称的群组。"
+      invalid_integer_min_max: "值必须介于 %{min} 和 %{max}之间。"
       invalid_integer_min: "值必须为 %{min} 或更大。"
       invalid_integer_max: "值不能大于 %{max}。"
       invalid_integer: "值必须是整数。"
-      regex_mismatch: "值不符合需要的格式。"
-      must_include_latest: "顶部菜单必须包含“最新”标签。"
+      regex_mismatch: "值与所需格式不相符。"
+      must_include_latest: "顶部菜单必须包含“最新”标签页。"
       invalid_string: "无效值。"
-      invalid_string_min_max: "必须在 %{min} 和 %{max} 字内。"
-      invalid_string_min: "必须超过 %{min} 个字符。"
-      invalid_string_max: "必须不超过 %{max} 个字符。"
-      invalid_json: "无效的 JSON"
-      invalid_reply_by_email_address: "值必须包含 '%{reply_key' 并且要与通知邮件不同。"
-      invalid_alternative_reply_by_email_addresses: "必须包括 “%{reply_key}” 并与通知邮件地址不同。"
-      pop3_polling_host_is_empty: "在启用 POP3 轮询前，您必须设置 'pop3 polling host'。"
-      pop3_polling_username_is_empty: "在启用 POP3 轮询前，您必须设置 'pop3 polling username'。"
-      pop3_polling_password_is_empty: "在启用 POP3 轮询前，您必须设置 'pop3 polling password'。"
-      pop3_polling_authentication_failed: "POP3 验证失败。请验证您的 pop3 账户信息。"
-      reply_by_email_address_is_empty: "在启用邮件回复之前，您必须设置“reply by email address”。"
-      email_polling_disabled: "在启用邮件回复功能前，您必须启用手动或者 POP3 轮询。"
-      user_locale_not_enabled: "您必须先设置 'allow user locale' 再启用该设置。"
-      invalid_regex: "正则表达式非法或者不允许。"
-      email_editable_enabled: "您必须先禁用 'email editable' 再启用该设置。"
-      staged_users_disabled: "您必须先启用“暂存用户”再启用该设置。"
-      reply_by_email_disabled: "您必须先启用 '用 email 回复' 再启用该设置。"
-      discourse_connect_url_is_empty: "在启用该设置前必须设置“discourse connect url”。"
-      discourse_connect_invite_only: "您不能够同时启用DiscourseConnect和仅邀请模式。"
-      enable_local_logins_disabled: "必须先启用“启用本地登录”，才能启用此设置。"
-      min_username_length_exists: "不能设置最小用户名长度大于最短用户名（%{username}）。"
-      min_username_length_range: "不能将最小值设置为高于最大值。"
-      max_username_length_exists: "不能设置最大用户名长度小于最长用户名（%{username}）。"
-      max_username_length_range: "不能将最大值设置为低于最小值。"
-      invalid_hex_value: "颜色值需为6位16进制代码。"
-      empty_selectable_avatars: "启用该设置前，您必须先上传至少两个可选的头像。"
+      invalid_string_min_max: "必须介于 %{min} 和 %{max} 个字符之间。"
+      invalid_string_min: "必须至少为 %{min} 个字符。"
+      invalid_string_max: "不得超过 %{max} 个字符。"
+      invalid_json: "无效的 JSON。"
+      invalid_reply_by_email_address: "值必须包含 '%{reply_key}' 并且与通知电子邮件不同。"
+      invalid_alternative_reply_by_email_addresses: "所有值必须包含 '%{reply_key}' 并且与通知电子邮件不同。"
+      pop3_polling_host_is_empty: "在启用 POP3 轮询前，您必须先设置 'pop3 polling host'。"
+      pop3_polling_username_is_empty: "在启用 POP3 轮询前，您必须先设置 'pop3 polling username'。"
+      pop3_polling_password_is_empty: "在启用 POP3 轮询前，您必须先设置 'pop3 polling password'。"
+      pop3_polling_authentication_failed: "POP3 验证失败。请验证您的 pop3 凭据。"
+      reply_by_email_address_is_empty: "在启用通过电子邮件回复之前，您必须先设置 'reply by email address'。"
+      email_polling_disabled: "在启用通过电子邮件回复之前，您必须先启用手动或者 POP3 轮询。"
+      user_locale_not_enabled: "在启用此设置之前，您必须先启用 'allow user locale'。"
+      invalid_regex: "正则表达式无效或不被允许。"
+      email_editable_enabled: "在启用此设置之前，您必须先禁用 'email editable'。"
+      staged_users_disabled: "在启用此设置之前，您必须先启用 'staged users'。"
+      reply_by_email_disabled: "在启用此设置之前，您必须先启用 'reply by email'。"
+      discourse_connect_url_is_empty: "在启用此设置之前，您必须先设置 'discourse connect url'。"
+      discourse_connect_invite_only: "您不能同时启用 DiscourseConnect 和仅邀请模式。"
+      enable_local_logins_disabled: "在启用此设置之前，您必须先启用 'enable local logins'。"
+      min_username_length_exists: "您不能将最小用户名长度设置为高于最短用户名 (%{username})。"
+      min_username_length_range: "您不能将最小值设置为高于最大值。"
+      max_username_length_exists: "您不能将最大用户名长度设置为低于最长用户名 (%{username})。"
+      max_username_length_range: "您不能将最大值设置为低于最小值。"
+      invalid_hex_value: "颜色值必须是 6 位十六进制代码。"
+      empty_selectable_avatars: "在启用此设置之前，您必须先上传至少两个可选择的头像。"
       category_search_priority:
-        low_weight_invalid: "您不能将权重设置为大于或等于1。"
-        high_weight_invalid: "您不能将权重设置为小于或等于1。"
+        low_weight_invalid: "您不能将权重设置为大于或等于 1。"
+        high_weight_invalid: "您不能将权重设置为小于或等于 1。"
       allowed_unicode_usernames:
-        regex_invalid: "正在表达式无效：%{error}"
-        leading_trailing_slash: "正则表达式不能以斜杠作为开头或结尾。"
-      unicode_usernames_avatars: "内置的头像系统不支持Unicode用户名。"
-      list_value_count: "该列表必须包含%{count}个值。"
+        regex_invalid: "正则表达式无效：%{error}"
+        leading_trailing_slash: "正则表达式不得以斜杠作开头或结尾。"
+      unicode_usernames_avatars: "内部系统头像不支持 Unicode 用户名。"
+      list_value_count: "该列表必须恰好包含 %{count} 个值。"
     placeholder:
       discourse_connect_provider_secrets:
         key: "www.example.com"
         value: "DiscourseConnect 密钥"
   search:
-    extreme_load_error: "站点处于高负荷状态，搜索已关闭，稍后再试。"
-    within_post: "#%{post_number} 由 %{username}"
+    extreme_load_error: "站点负载过大，搜索被禁用，请稍后再试"
+    within_post: "#%{post_number}，来自 %{username}"
     types:
-      category: "分类"
+      category: "类别"
       topic: "结果"
       user: "用户"
-    results_page: "关于“%{term}”的搜索结果"
+    results_page: "'%{term}' 的搜索结果"
     audio: "[音频]"
     video: "[视频]"
   discourse_connect:
     login_error: "登录错误"
-    not_found: "无法找到您的账户。请联系站点管理人员。"
-    account_not_approved: "您的帐户正在等待批准。获得批准时您会收到一封通知邮件。"
-    unknown_error: "您的账户出了一点问题。请联系站点管理人员。"
+    not_found: "找不到您的帐户。请联系站点管理员。"
+    account_not_approved: "您的帐户正在等待审批。当您获得批准时，您将收到一封电子邮件通知。"
+    unknown_error: "您的帐户有问题。请联系站点管理员。"
     timeout_expired: "帐户登录超时，请尝试重新登录。"
-    no_email: "没有找到邮件地址。请联系站点管理员。"
-    blank_id_error: "当前空缺的`external_id`是必需的"
-    email_error: "不能使用邮箱<b>%{email}</b>注册账户。请联系站点管理员。"
-    missing_secret: "身份认证由于缺少密钥而导致失败。请与站点管理员联系以修复此问题。"
-    invite_redeem_failed: "邀请失败。请联系管理员。"
-  original_poster: "原始作者"
-  most_posts: "大部分帖子"
-  most_recent_poster: "最新发帖者"
-  frequent_poster: "频繁发帖者"
-  poster_description_joiner: ", "
+    no_email: "没有提供电子邮件地址。请联系站点管理员。"
+    blank_id_error: "`external_id` 是必需的，但为空"
+    email_error: "无法使用电子邮件地址 <b>%{email}</b> 注册帐户。请联系站点管理员。"
+    missing_secret: "由于缺少密钥，身份验证失败。请联系站点管理员解决此问题。"
+    invite_redeem_failed: "邀请确认失败。请联系站点管理员。"
+  original_poster: "原始发帖人"
+  most_recent_poster: "最新发帖人"
+  frequent_poster: "频繁发帖人"
+  poster_description_joiner: "、"
   redirected_to_top_reasons:
-    new_user: "欢迎来到我们的社区！这些都是最近热门话题。"
-    not_seen_in_a_month: "欢迎回来！我们已经好久没见到您了。这些是您不在时的最热门话题。"
+    new_user: "欢迎来到我们的社区！这些是最近最热门的话题。"
+    not_seen_in_a_month: "欢迎回来！我们好久没见到您了。这些是您不在时的最热门话题。"
   merge_posts:
     edit_reason:
-      other: "%{username}合并了 %{count} 个帖子"
+      other: "%{username} 并入了 %{count} 个帖子"
     errors:
-      different_topics: "无法合并不同话题的帖子。"
-      different_users: "无法合并不同用户的帖子。"
-      max_post_length: "帖子无法合并，因为合并后的帖子长度超出了允许的长度。"
+      different_topics: "属于不同话题的帖子无法合并。"
+      different_users: "属于不同用户的帖子无法合并。"
+      max_post_length: "帖子无法合并，因为合并后的帖子长度超过允许值。"
   move_posts:
     new_topic_moderator_post:
-      other: "%{count} 个帖子被拆分到新话题：%{topic_link}"
+      other: "%{count} 个帖子被拆分为一个新话题：%{topic_link}"
     new_message_moderator_post:
-      other: "%{count} 个帖子被拆分到一个新的私信中：%{topic_link}"
+      other: "%{count} 个帖子被拆分为一条新消息：%{topic_link}"
     existing_topic_moderator_post:
-      other: "%{count} 个帖子已被合并到了现有话题：%{topic_link}"
+      other: "%{count} 个帖子被合并到现有话题中：%{topic_link}"
     existing_message_moderator_post:
-      other: "%{count}个帖子已被合并到一个现存的私信中：%{topic_link}"
+      other: "%{count} 个帖子被合并到现有消息中：%{topic_link}"
   change_owner:
-    post_revision_text: "所有权转移"
+    post_revision_text: "已转让所有权"
   publish_page:
     slug_errors:
       blank: "不能为空"
-      unavailable: "是不可用的"
+      unavailable: "不可用"
       invalid: "包含无效字符"
   topic_statuses:
     autoclosed_message_max_posts:
-      other: "私信中回复已经达到上限 %{count}，自动锁定。"
+      other: "在达到 %{count} 个回复的最大限制后，此消息已被自动关闭。"
     autoclosed_topic_max_posts:
-      other: "话题中回复已经达到上限 %{count}，自动关闭。"
+      other: "在达到 %{count} 个回复的最大限制后，此话题已被自动关闭。"
     autoclosed_enabled_days:
-      other: "该话题在创建%{count}天后自动关闭。不再允许添加新回复。"
+      other: "此话题已在 %{count} 天后被自动关闭。不再允许新回复。"
     autoclosed_enabled_hours:
-      other: "该话题在创建%{count}小时后自动关闭。不再允许新的回复。"
+      other: "此话题已在 %{count} 小时后被自动关闭。不再允许新回复。"
     autoclosed_enabled_minutes:
-      other: "该话题在创建%{count}分钟后自动关闭。不再允许新的回复。"
+      other: "此话题已在 %{count} 分钟后被自动关闭。不再允许新回复。"
     autoclosed_enabled_lastpost_days:
-      other: "该话题在最后一个回复创建后%{count}天后自动关闭。不再允许新的回复。"
+      other: "此话题已在最后回复的 %{count} 天后被自动关闭。不再允许新回复。"
     autoclosed_enabled_lastpost_hours:
-      other: "该话题在最后一个回复创建后%{count}小时后自动关闭。不再允许添加新回复。"
+      other: "此话题已在最后回复的 %{count} 小时后被自动关闭。不再允许新回复。"
     autoclosed_enabled_lastpost_minutes:
-      other: "本话题在最后一个回复创建后%{count}分钟后自动锁定。不再允许添加新回复。"
+      other: "此话题已在最后回复的 %{count} 分钟后被自动关闭。不再允许新回复。"
     autoclosed_disabled_days:
-      other: "该话题开启 %{count} 天后将自动关闭。"
+      other: "此话题已在 %{count} 天后被自动打开。"
     autoclosed_disabled_hours:
-      other: "该话题开启 %{count} 小时后将自动关闭。"
+      other: "此话题已在 %{count} 小时后被自动打开。"
     autoclosed_disabled_minutes:
-      other: "该话题开启 %{count} 分钟后将自动关闭。"
+      other: "此话题已在 %{count} 分钟后被自动打开。"
     autoclosed_disabled_lastpost_days:
-      other: "该话题将在最后一个回复 %{count} 天后自动关闭。"
+      other: "此话题已在最后回复的 %{count} 天后被自动打开。"
     autoclosed_disabled_lastpost_hours:
-      other: "该话题将在最后一个回复 %{count} 小时后自动关闭。"
+      other: "此话题已在最后回复的 %{count} 小时后被自动打开。"
     autoclosed_disabled_lastpost_minutes:
-      other: "该话题将在最后一个回复 %{count} 分钟后自动关闭。"
-    autoclosed_disabled: "本话题是开放的，可以添加新的回复。"
-    autoclosed_disabled_lastpost: "本话题现在开放了。可以添加新的回复。"
-    auto_deleted_by_timer: "由计时器自动删除。"
+      other: "此话题已在最后回复的 %{count} 分钟后被自动打开。"
+    autoclosed_disabled: "此话题现在已被打开。允许新回复。"
+    autoclosed_disabled_lastpost: "此话题现在已被打开。允许新回复。"
+    auto_deleted_by_timer: "已由定时器自动删除。"
   login:
-    invalid_second_factor_method: "所选的双重认证方法无效。"
-    not_enabled_second_factor_method: "您的帐户未启用所选的双重验证方式。"
+    invalid_second_factor_method: "所选双重身份验证方法无效。"
+    not_enabled_second_factor_method: "您的帐户未启用所选双重身份验证方法。"
     security_key_description: "当您准备好物理安全密钥后，请按下面的“使用安全密钥进行身份验证”按钮。"
     security_key_alternative: "尝试另一种方式"
     security_key_authenticate: "使用安全密钥进行身份验证"
-    security_key_not_allowed_error: "安全密钥验证超时或被取消。"
+    security_key_not_allowed_error: "安全密钥身份验证超时或被取消。"
     security_key_no_matching_credential_error: "在提供的安全密钥中找不到匹配的凭据。"
     security_key_support_missing_error: "您当前的设备或浏览器不支持使用安全密钥。请使用其他方法。"
     security_key_invalid: "验证安全密钥时出错。"
     not_approved: "您的帐户尚未获得批准。一旦可以登录，您会收到电子邮件通知。"
-    incorrect_username_email_or_password: "用户名、电子邮箱或密码不正确"
-    incorrect_password: "密码错误"
-    wait_approval: "谢谢注册账户。我们会在您的账户获得批准之后通知您。"
-    active: "您的账户已经被激活，可以使用了。"
-    activate_email: "<p>快完成了！我们发送了一封激活邮件到<b>%{email}</b>。请按照邮件中的步骤来激活您的账户。</p><p>如果您没有收到邮件，请检查您的垃圾邮件收件箱。</p>"
+    incorrect_username_email_or_password: "用户名、电子邮件或密码不正确"
+    incorrect_password: "密码不正确"
+    wait_approval: "感谢您注册。当您的帐户获得批准后，我们会通知您。"
+    active: "您的帐户已被激活，并且可以使用了。"
+    activate_email: "<p>快完成了！我们向 <b>%{email}</b> 发送了一封激活邮件。请按照邮件中的说明操作来激活您的帐户。</p><p>如果您没有收到邮件，请检查您的垃圾邮件文件夹。</p>"
     not_activated: "您还无法登录。我们向您发送了一封激活电子邮件。请按照电子邮件中的说明操作来激活您的帐户。"
-    not_allowed_from_ip_address: "您不能以 %{username} 身份从该 IP 地址登录。"
-    admin_not_allowed_from_ip_address: "您不能从该 IP 地址以管理员身份登录。"
-    reset_not_allowed_from_ip_address: "您不能够从当前的IP地址请求重置密码。"
-    suspended: "您要等到 %{date} 之后才能登录。"
-    suspended_with_reason: "账户已封禁至 %{date}：%{reason}"
+    not_allowed_from_ip_address: "您无法从该 IP 地址以 %{username} 身份登录。"
+    admin_not_allowed_from_ip_address: "您无法从该 IP 地址以管理员身份登录。"
+    reset_not_allowed_from_ip_address: "您无法从该 IP 地址请求密码重置。"
+    suspended: "您在 %{date}之前无法登录。"
+    suspended_with_reason: "帐户已被封禁至 %{date}：%{reason}"
     errors: "%{errors}"
-    not_available: "不可用，试试%{suggestion}？"
-    something_already_taken: "出了一些问题，可能此用户名或电子邮箱已经被注册。试试 忘记密码链接吧。"
+    not_available: "不可用，试试 %{suggestion}？"
+    something_already_taken: "出了点问题，可能该用户名或电子邮件已被注册，试试点击忘记密码链接。"
     omniauth_error:
-      generic: "抱歉，验证您的账户时出错。请重试。"
+      generic: "抱歉，验证您的帐户时出错。请重试。"
       csrf_detected: "授权超时，或者您已切换浏览器。请重试。"
-      request_error: "授权时发生错误。请重试。"
+      request_error: "启动授权时发生错误。请重试。"
       invalid_iat: "由于服务器时钟差异，无法验证授权令牌。请重试。"
-    omniauth_error_unknown: "在处理您的登录过程中发生了错误，请重试。"
-    omniauth_confirm_title: "使用%{provider}登录"
+    omniauth_error_unknown: "处理您的登录时出错，请重试。"
+    omniauth_confirm_title: "使用 %{provider} 登录"
     omniauth_confirm_button: "继续"
-    authenticator_error_no_valid_email: "关联%{account}的账户没有优秀的邮件地址。您可能需要用不同的邮件地址配置您的账户。"
-    new_registrations_disabled: "现在不允许注册新账户。"
-    password_too_long: "密码不能超过 200 个字符。"
-    email_too_long: "您输入的邮件太长了。邮箱名不得超过 254 字符，域名必须不超过 253 字符。"
+    authenticator_error_no_valid_email: "不允许与 %{account} 关联的电子邮件地址。您可能需要使用不同的电子邮件地址配置您的帐户。"
+    new_registrations_disabled: "目前不允许注册新帐户。"
+    password_too_long: "密码不得超过 200 个字符。"
+    email_too_long: "您提供的电子邮件过长。邮箱名称不得超过 254 个字符，域名不得超过 253 个字符。"
     wrong_invite_code: "您输入的邀请码不正确。"
-    reserved_username: "该用户名不可被使用。"
-    missing_user_field: "您还没有填写完所有用户字段"
-    auth_complete: "验证已经完成。"
-    click_to_continue: "点击这里继续。"
-    already_logged_in: "抱歉！这个邀请只用于尚未拥有账户的新用户。"
-    second_factor_title: "双重认证"
-    second_factor_description: "请输入您的APP验证码："
-    second_factor_backup_description: "请输入备用码："
-    second_factor_backup_title: "双重认证备份代码"
+    reserved_username: "不允许使用该用户名。"
+    missing_user_field: "您尚未完成所有用户字段"
+    auth_complete: "身份验证完成。"
+    click_to_continue: "单击此处继续。"
+    already_logged_in: "抱歉！此邀请面向目前没有帐户的新用户。"
+    second_factor_title: "双重身份验证"
+    second_factor_description: "请输入应用中的必需身份验证代码："
+    second_factor_backup_description: "请输入您的备份代码之一："
+    second_factor_backup_title: "双重备份代码"
     invalid_second_factor_code: "验证码无效。每个代码只能使用一次。"
     invalid_security_key: "无效的安全密钥。"
     missing_second_factor_name: "请提供一个名称。"
-    missing_second_factor_code: "请提供一个验证码"
+    missing_second_factor_code: "请提供一个代码。"
     second_factor_toggle:
-      totp: "请改用身份验证器应用或安全密钥"
-      backup_code: "使用备份代码"
+      totp: "改用身份验证器应用或安全密钥"
+      backup_code: "改用备份代码"
   admin:
     email:
       sent_test: "已发送！"
     user:
       merge_user:
-        updating_username: "正在更新用户名..."
-        changing_post_ownership: "更改帖子所有权..."
-        merging_given_daily_likes: "正在合并每日喜欢..."
-        merging_post_timings: "正在合并帖子发布时间..."
-        merging_user_visits: "正在合并用户访问..."
-        updating_site_settings: "正在更新站点设置..."
-        updating_user_stats: "正在更新用户统计信息..."
-        merging_user_attributes: "正在合并用户属性..."
-        updating_user_ids: "正在更新用户ID ..."
-        deleting_source_user: "正在删除源用户..."
+        updating_username: "正在更新用户名…"
+        changing_post_ownership: "正在更改帖子所有权…"
+        merging_given_daily_likes: "正在合并每日赞…"
+        merging_post_timings: "正在合并帖子时间…"
+        merging_user_visits: "正在合并用户访问…"
+        updating_site_settings: "正在更新站点设置…"
+        updating_user_stats: "正在更新用户统计信息…"
+        merging_user_attributes: "正在合并用户特性…"
+        updating_user_ids: "正在更新用户 ID…"
+        deleting_source_user: "正在删除源用户…"
   user:
-    deactivated: "因发送至“%{email}”的邮件被多次退信，取消激活"
-    deactivated_by_staff: "被管理人员禁用"
+    deactivated: "由于 '%{email}' 的退回电子邮件过多，已被停用。"
+    deactivated_by_staff: "被管理人员停用"
     deactivated_by_inactivity:
-      other: "%{count}天不活动后自动停用"
+      other: "已在闲置 %{count} 天后被自动停用"
     activated_by_staff: "被管理人员激活"
-    new_user_typed_too_fast: "新用户打字太快了"
+    new_user_typed_too_fast: "新用户输入过快"
     content_matches_auto_silence_regex: "内容符合自动禁言的正则表达式"
-    content_matches_auto_block_regex: "内容符合自动封禁的正则表达式"
+    content_matches_auto_block_regex: "内容符合自动禁止的正则表达式"
     username:
-      short: "必须超过 %{min} 个字"
-      long: "必须不超过 %{max} 个字"
-      too_long: "太长"
-      characters: "只能使用数字、字母、短横线、小数点和下划线"
-      unique: "已被使用"
+      short: "必须至少为 %{min} 个字符"
+      long: "不得超过 %{max} 个字符"
+      too_long: "过长"
+      characters: "只得包含数字、字母、破折号、点和下划线"
+      unique: "必须唯一"
       blank: "必须存在"
       must_begin_with_alphanumeric_or_underscore: "必须以字母、数字或下划线开头"
       must_end_with_alphanumeric: "必须以字母或数字结尾"
-      must_not_contain_two_special_chars_in_seq: "必须不包括连续的 2 个或更多的特殊字符（.-_）"
-      must_not_end_with_confusing_suffix: "不能以迷惑性的后缀结尾，比如 .json 或者 .png 等"
+      must_not_contain_two_special_chars_in_seq: "不得包含 2 个或更多特殊字符 (.-_) 的序列"
+      must_not_end_with_confusing_suffix: "不得以 .json 或 .png 等令人困惑的后缀结尾。"
     email:
       invalid: "无效。"
-      not_allowed: "本站不允许使用该邮箱服务商提供的电子邮箱，请使用其它邮箱地址。"
+      not_allowed: "不允许来自该电子邮件提供商。请使用其他电子邮件地址。"
       blocked: "不被允许。"
-      revoked: "在%{date}之前不发送邮件至“%{email}”"
-      does_not_exist: "N/A"
+      revoked: "在 %{date}之前不会向 '%{email}' 发送电子邮件。"
+      does_not_exist: "不适用"
     ip_address:
-      blocked: "不允许从您的 IP 地址注册新用户。"
-      max_new_accounts_per_registration_ip: "不允许从您的 IP 地址注册新用户（达到上限）。联系一个管理人员。"
+      blocked: "不允许从您的 IP 地址进行新注册。"
+      max_new_accounts_per_registration_ip: "不允许从您的 IP 地址进行新注册（已达到最大限制）。请联系管理人员。"
     website:
-      domain_not_allowed: "网站无效。允许的域名有：%{domains}"
-    auto_rejected: "因时限被自动拒绝。查看站点自动处理队列时限设置。"
+      domain_not_allowed: "网站无效。允许的网域包括：%{domains}"
+    auto_rejected: "因时限被自动拒绝。查看 auto_handle_queued_age 站点设置。"
     destroy_reasons:
       unused_staged_user: "未使用的暂存用户"
-      fixed_primary_email: "为暂存用户固定主要邮箱"
-      same_ip_address: "同一IP地址(%{ip_address})如其他用户"
-      inactive_user: "非活跃用户"
-      reviewable_reject_auto: "自动处理排队的可审核内容"
-      reviewable_reject: "审核用户被拒绝"
-    email_in_spam_header: "用户的第一封电子邮件已被标记为垃圾邮件"
-    already_silenced: "用户已被 %{staff} 在 %{time_ago} 静音。"
-    already_suspended: "用户已被 %{staff} 在 %{time_ago} 封禁。"
+      fixed_primary_email: "修复了暂存用户的常用电子邮件"
+      same_ip_address: "与其他用户相同的 IP 地址 (%{ip_address})"
+      inactive_user: "停用用户"
+      reviewable_reject_auto: "自动处理排队的可审核条目"
+      reviewable_reject: "可审核用户被拒绝"
+    email_in_spam_header: "用户的第一封电子邮件已被举报为垃圾邮件"
+    already_silenced: "用户已在 %{time_ago}被 %{staff} 禁言。"
+    already_suspended: "用户已在 %{time_ago}被 %{staff} 封禁。"
+    cannot_delete_has_posts:
+      other: "用户 %{username} 在公开话题或个人消息中有 %{count} 个帖子，因此无法被删除。"
   reviewables_reminder:
     submitted:
-      other: "项目提交于1%{count}小时前。[请审核](%{base_path}/review)。"
+      other: "条目于 %{count} 小时前提交。[请审核](%{base_path}/review)。"
     subject_template:
-      other: "%{count}个项目需要被审核"
+      other: "%{count} 个条目需要审核"
   unsubscribe_mailer:
-    title: "取消订阅发件人"
-    subject_template: "确认您不想要收到%{site_title}的电子邮件更新"
+    title: "退订邮件"
+    subject_template: "确认您不再希望收到%{site_title}的电子邮件动态"
     text_body_template: |
-      我们收到了取消订阅来自%{site_domain_name}的邮件更新的请求（是您的操作吗？）。
-
-      如果您确认该请求，点击链接：
+      有人（可能是您？）请求不再从 %{site_domain_name} 向此地址发送电子邮件动态。
+      如果您希望确认此操作，请点击此链接：
 
       %{confirm_unsubscribe_link}
 
-      如果您想要继续收到邮件更新，您可以忽略这封邮件。
+
+      如果您想继续接收电子邮件动态，您可以忽略此电子邮件。
   invite_mailer:
-    title: "要求发件人"
-    subject_template: "%{inviter_name} 邀请您参与 '%{topic_title}' 于 %{site_domain_name}"
+    title: "邀请邮件"
+    subject_template: "%{inviter_name} 邀请您加入 %{site_domain_name} 上的 '%{topic_title}'"
     text_body_template: |
-      %{inviter_name} 邀请您参与讨论
+      %{inviter_name} 邀请您加入讨论
 
       > **%{topic_title}**
       >
       > %{topic_excerpt}
 
-      于
+      -
 
       > %{site_title} -- %{site_description}
 
-      如果您感兴趣，点击以下链接:
+      如果您感兴趣，请点击以下链接：
 
       %{invite_link}
   custom_invite_mailer:
-    title: "自定义邀请发件人"
-    subject_template: "%{inviter_name}邀请您加入'%{topic_title}'于%{site_domain_name}"
+    title: "自定义邀请邮件"
+    subject_template: "%{inviter_name} 邀请您加入 %{site_domain_name} 上的 '%{topic_title}'"
     text_body_template: |
-      %{inviter_name} 邀请您参与讨论
+      %{inviter_name} 邀请您加入讨论
 
       > **%{topic_title}**
       >
       > %{topic_excerpt}
 
-      于
+      -
 
       > %{site_title} -- %{site_description}
 
-      留言为
+      消息为
 
       > %{user_custom_message}
 
-      如果您感兴趣，点击以下链接:
+      如果您感兴趣，请点击以下链接：
 
       %{invite_link}
   invite_forum_mailer:
-    title: "邀请论坛发件人"
-    subject_template: "%{inviter_name}邀请您加入%{site_domain_name}"
+    title: "邀请论坛邮件"
+    subject_template: "%{inviter_name} 邀请您加入 %{site_domain_name}"
     text_body_template: |
       %{inviter_name} 邀请您加入
 
@@ -2314,12 +2340,12 @@ zh_CN:
       >
       > %{site_description}
 
-      如果您感兴趣，点击以下链接:
+      如果您感兴趣，请点击以下链接：
 
       %{invite_link}
   custom_invite_forum_mailer:
-    title: "自定义论坛邀请发件人"
-    subject_template: "%{inviter_name}邀请您加入%{site_domain_name}"
+    title: "自定义邀请论坛邮件"
+    subject_template: "%{inviter_name} 邀请您加入 %{site_domain_name}"
     text_body_template: |
       %{inviter_name} 邀请您加入
 
@@ -2327,116 +2353,156 @@ zh_CN:
       >
       > %{site_description}
 
-      留言为
+      消息为
 
       > %{user_custom_message}
 
-      如果您感兴趣，点击以下链接:
+      如果您感兴趣，请点击以下链接：
 
       %{invite_link}
   invite_password_instructions:
-    title: "邀请密码指示"
-    subject_template: "为 %{site_name} 账户设置密码"
+    title: "邀请密码说明"
+    subject_template: "为您的 %{site_name} 帐户设置密码"
     text_body_template: |
-      感谢您接受来自%{site_name}的邀请——欢迎！
+      感谢您接受加入 %{site_name} 的邀请 - 欢迎！
 
-      点击下面的链接立即选择一个密码：
+      点击此链接立即选择一个密码：
       %{base_url}/u/password-reset/%{email_token}
 
-      （如果链接已经过期，在登录时点击“我忘记了密码”，再次输入您的邮箱即可。）
+      （如果链接已经过期，请在使用您的电子邮件地址登录时选择“我忘记密码了”。）
   download_backup_mailer:
-    title: "下载备份邮件发件人"
+    title: "下载备份邮件"
     subject_template: "[%{email_prefix}] 站点备份下载"
     text_body_template: |
-      这是您的[站点备份文件](%{backup_file_path})。
+      这是您请求的[站点备份下载](%{backup_file_path})。
 
-      出于安全原因，我们把下载链接发送至您验证过的邮箱。
+      出于安全原因，我们已将此下载链接发送至您验证过的电子邮件地址。
 
-      （如果您**没有**请求下载，您需要思考一下了——某管理员请求了备份文件）
+      （如果您**没有**请求此下载，您应该予以重视 - 其他人可能拥有您的站点的管理员访问权限。）
     no_token: |
-      抱歉，这个备份下载链接已经被使用或已经过期。
+      抱歉，此备份下载链接已被使用或已过期。
   admin_confirmation_mailer:
     title: "管理员确认"
-    subject_template: "[%{site_name}] 确认新管理员账户"
-    text_body_template: "请确认您要添加**%{target_username}（%{target_email}）**作为您的论坛的管理员。 \n\n[确认管理员账户](%{admin_confirm_url})\n"
+    subject_template: "[%{email_prefix}] 确认新管理员帐户"
+    text_body_template: "请确认您要添加 **%{target_username} (%{target_email})** 作为您的论坛的管理员。 \n\n[确认管理员帐户](%{admin_confirm_url})\n"
   test_mailer:
-    title: "测试发件人"
-    subject_template: "[%{email_prefix}] 邮件可达性测试"
-    text_body_template: "这是一封测试邮件，它来自 \n\n[**%{base_url}**][0]\n\n邮件传输是复杂的。下面是几个您需要第一时间留意的重点：\n\n- 请*确保*正确地在站点设置中设置了`notification email`。**您所发出的邮件的来源字段的域名需要被验证**。\n\n- 清楚如何使用您的邮件客户端查看邮件原始内容，这样您能够检查邮件标头以获取重要线索。在Gmail中，每封邮件的右上角下拉菜单中都有“显示原始内容”的选项。\n\n- **重要:**您的ISP是否设置了反向DNS记录以关联您用于发送邮件的域名和IP地址？[测试您的反向PTR记录][2]。如果您的ISP未正确设置反向DNS记录，您的邮件不太可能被正确送达。\n\n- 您的域名的[SPF记录][8]正确吗？[测试您的SPF记录][1]。注意SPF的正确记录类型是TXT.\n\n- 您的域名的[DKIM记录][3]正确吗？这会显著地提升邮件送达。[测试您的DKIM记录][7]。\n\n- 如果您使用自建的邮件服务器，确保您的邮件服务器的IP地址[不在邮件屏蔽列表中][4]。还要验证其在HELO信息中正确地发送出一个DNS解析正常的域名。否则，您的邮件会被许多邮件服务拒收。\n\n- 我们强烈建议您**发送一封测试邮件到[mail-tester.com][mt]**以验证上述所有设置正常。\n\n（较*方便*的方法就是创建一个[SendGrid][sg]、[SparkPost][sp]、[Mailgun][mg]或[Mailjet][mj]的账号，这些平台提供适用于小型社区的低成本邮寄服务。不过，您仍然需要在DNS中设置SPF和DKIM记录！）\n\n希望您能成功收到这封测试邮件！\n\n祝君好运，\n\n您在[Discourse](https://www.discourse.org)的伙伴\n\n[0]: %{base_url}\n[1]: https://www.kitterman.com/spf/validate.html\n[2]: https://mxtoolbox.com/ReverseLookup.aspx\n[3]: http://www.dkim.org/\n[4]: https://whatismyipaddress.com/blacklist-check\n[7]: https://www.mail-tester.com/spf-dkim-check\n[8]: http://www.openspf.org/SPF_Record_Syntax\n[sg]: https://goo.gl/r1WMF6\n[sp]: https://www.sparkpost.com/\n[mg]: https://www.mailgun.com/\n[mj]: https://www.mailjet.com/pricing/\n[mt]: https://www.mail-tester.com/\n"
+    title: "测试邮件"
+    subject_template: "[%{email_prefix}] 电子邮件能否递送成功测试"
+    text_body_template: |
+      这是一封测试电子邮件，来自
+
+      [**%{base_url}**][0]
+
+      电子邮件能否递送成功取决于很多因素。下面是几个您需要首先留意的重要方面：
+
+      - 请*确保*在站点设置中正确设置 `notification email` from: 地址。**您所发出的电子邮件的“发件人”地址中指定的网域需要进行验证**。
+
+      - 知道如何使用您的邮件客户端查看电子邮件原始内容，这样您能够检查电子邮件标头以获取重要线索。在 Gmail 中，每封邮件右上角的下拉菜单中都会提供“显示原始邮件”选项。
+
+      - **重要提示**：您的 ISP 是否输入了反向 DNS 记录以关联您用于发送邮件的域名和 IP 地址？[测试您的反向 PTR 记录][2]。如果您的 ISP 未输入正确的反向 DNS 记录，您的电子邮件不太可能递送成功。
+
+      - 您的网域的 [SPF 记录][8]正确吗？[测试您的 SPF 记录][1]。注意 SPF 的官方记录类型是 TXT。
+
+      - 您的网域的 [DKIM 记录][3]正确吗？这会显著提升电子邮件递送成功几率。[测试您的 DKIM 记录][7]。
+
+      - 如果您使用自建的邮件服务器，请确保您的邮件服务器的 IP [不在电子邮件屏蔽名单中][4]。还要验证它肯定发送一个可以在 HELO 消息中解析 DNS 的完全限定主机名。否则，您的电子邮件会被许多邮件服务拒绝。
+
+      - 强烈建议您**向 [mail-tester.com][mt] 发送一封测试邮件**以验证上述所有设置正常。
+
+      （一种*简单的*方法是创建一个 [SendGrid][sg]、[SparkPost][sp]、[Mailgun][mg] 或 [Mailjet][mj] 帐户，这些平台提供适用于小型社区的低成本邮寄方案。不过，您仍然需要在 DNS 中设置 SPF 和 DKIM 记录！）
+
+      希望您能成功收到这封测试邮件！
+
+      祝君好运，
+
+      您在 [Discourse](https://www.discourse.org) 的伙伴
+
+      [0]: %{base_url}
+      [1]: https://www.kitterman.com/spf/validate.html
+      [2]: https://mxtoolbox.com/ReverseLookup.aspx
+      [3]: http://www.dkim.org/
+      [4]: https://whatismyipaddress.com/blacklist-check
+      [7]: https://www.mail-tester.com/spf-dkim-check
+      [8]: http://www.openspf.org/SPF_Record_Syntax
+      [sg]: https://goo.gl/r1WMF6
+      [sp]: https://www.sparkpost.com/
+      [mg]: https://www.mailgun.com/
+      [mj]: https://www.mailjet.com/pricing/
+      [mt]: https://www.mail-tester.com/
   new_version_mailer:
-    title: "新版本发件人"
-    subject_template: "[%{email_prefix}] 新 Discourse 版本可供升级"
+    title: "新版本邮件"
+    subject_template: "[%{email_prefix}] 新 Discourse 版本，有可用更新"
     text_body_template: |
-      Hooray，[Discourse](https://www.discourse.org)的新版本现已发布！
+      万岁，新版本的 [Discourse](https://www.discourse.org) 现已发布！
 
       您的版本：%{installed_version}
       新版本：**%{new_version}**
 
-      - 轻松使用我们的**[浏览器一键式升级](%{base_url}/admin/upgrade)**进行升级
+      - 使用我们简单的**[一键浏览器升级](%{base_url}/admin/upgrade)**进行升级
 
-      - 查看[发行说明](https://meta.discourse.org/tag/release-notes)中的新功能或查看[原始GitHub更新日志](https://github.com/discourse/discourse/commits/master)
+      - 查看[版本说明](https://meta.discourse.org/tag/release-notes)中的最新变化或查看[原始 GitHub 更新日志](https://github.com/discourse/discourse/commits/main)
 
-      - 访问[meta.discourse.org](https://meta.discourse.org)获取资讯、讨论以及对Discourse的支持
+      - 访问 [meta.discourse.org](https://meta.discourse.org) 获取 Discourse 的资讯、讨论和支持
   new_version_mailer_with_notes:
-    title: "带注解的新版本发件人"
-    subject_template: "[%{email_prefix}] 可以升级"
+    title: "带版本说明的新版本邮件"
+    subject_template: "[%{email_prefix}] 有可用更新"
     text_body_template: |
-      Hooray，[Discourse](https://www.discourse.org)的新版本现已发布！
+      万岁，新版本的 [Discourse](https://www.discourse.org) 现已发布！
 
       您的版本：%{installed_version}
       新版本：**%{new_version}**
 
-      - 轻松使用我们的**[浏览器一键式升级](%{base_url}/admin/ upgrade)**进行升级
+      - 使用我们简单的**[一键浏览器升级](%{base_url}/admin/upgrade)**进行升级
 
-      - 查看[发行说明](https://meta.discourse.org/tag/release-notes)中的新功能或查看[原始GitHub更新日志](https://github.com/discourse/discourse/commits/master)
+      - 查看[版本说明](https://meta.discourse.org/tag/release-notes)中的最新变化或查看[原始 GitHub 更新日志](https://github.com/discourse/discourse/commits/main)
 
-      - 访问[meta.discourse.org](https://meta.discourse.org)获取资讯、讨论以及对Discourse的支持
+      - 访问 [meta.discourse.org](https://meta.discourse.org) 获取 Discourse 的资讯、讨论和支持
 
-      ### 发布说明
+      ### 版本说明
 
       %{notes}
   flag_reasons:
-    off_topic: "您的帖子被标记为 **偏离话题**：鉴于当前的话题标题和第一个帖子，社区成员们感觉它不适合处于这个话题中。"
-    inappropriate: "您的帖子被标记为 **不恰当**：社区成员感觉它有冒犯或者侮辱的意味，亦或是它违反了[社区准则](%{base_path}/guidelines)。"
-    spam: "您的帖子被标记为 **广告**：社区成员觉得它是广告，像是在过度地推广着什么，而不是预期中与话题有关的内容。"
-    notify_moderators: "您的帖子被标记为 **需要版主关注**：社区成员认为帖子需要管理人员介入。"
+    off_topic: "您的帖子被举报为**偏离话题**：鉴于话题标题和第一个帖子，社区认为它不适合该话题。"
+    inappropriate: "您的帖子被举报为**不当言论**：社区认为它有冒犯或者侮辱的意味，亦或违反了[我们的社区准则](%{base_path}/guidelines)。"
+    spam: "您的帖子被举报为**垃圾信息**：社区认为它是广告，像是在过度地推广着什么，而不是预期中与话题有关的内容。"
+    notify_moderators: "您的帖子被举报为**需要版主注意**：社区认为帖子需要管理人员手动干预。"
   flags_dispositions:
-    agreed: "谢谢您的私信。我们认为这是个问题。我们正在进行处理。"
-    agreed_and_deleted: "感谢通知我们。我们认为这是一个问题，并且我们已经删除了帖子。"
-    disagreed: "谢谢您的私信。我们正在进行处理。"
-    ignored: "感谢通知我们。我们正在调查情况。"
-    ignored_and_deleted: "感谢通知我们。我们已经删除了帖子。"
+    agreed: "感谢通知我们。我们认为这是个问题，正在进行调查。"
+    agreed_and_deleted: "感谢通知我们。我们认为这是个问题，并且已将该帖子移除。"
+    disagreed: "感谢通知我们。我们正在进行调查。"
+    ignored: "感谢通知我们。我们正在进行调查。"
+    ignored_and_deleted: "感谢通知我们。我们已将该帖子移除。"
   temporarily_closed_due_to_flags:
-    other: "因为大量社区成员的标记，这个话题被临时关闭 %{count} 小时。"
+    other: "由于大量社区举报，此话题被临时关闭至少 %{count} 小时。"
   system_messages:
     private_topic_title: "话题 #%{id}"
     contents_hidden: "请访问帖子以查看内容。"
     post_hidden:
-      title: "帖子隐藏"
-      subject_template: "帖子因社区标记隐藏"
+      title: "帖子被隐藏"
+      subject_template: "帖子因社区举报而被隐藏"
       text_body_template: |
         您好，
 
-        这是%{site_name}通知您的帖子已被隐藏的自动消息。
+        这是一封由 %{site_name} 自动发送的邮件，旨在通知您的帖子已被隐藏。
 
         <%{base_url}%{url}>
 
         %{flag_reason}
 
-        这个帖子被隐藏是因为被社区成员所标记，所以请考虑根据他们的反馈修改您的帖子。**您可以在 %{edit_delay} 分钟后开始编辑您的帖子，然后它将重新被显示。**
+        此帖子由于社区举报而被隐藏，因此请考虑根据他们的反馈修改您的帖子。**您可以在 %{edit_delay} 分钟后编辑您的帖子，然后它将自动被取消隐藏**。
 
-        然而，如果帖子再次被社区成员标记并隐藏，它将被隐藏至版主处理后。
+        不过，如果帖子再次由于社区举报而被隐藏，它将保持隐藏至管理人员介入。
 
-        想了解更多，请查看我们的[社区指引](%{base_url}/guidelines)。
+        有关更多指导，请参阅我们的[社区准则](%{base_url}/guidelines)。
     post_hidden_again:
-      title: "再次发布隐藏"
-      subject_template: "被社区标记所隐藏，已通知管理人员"
+      title: "帖子被再次隐藏"
+      subject_template: "帖子因社区举报而被隐藏，已通知管理人员"
       text_body_template: |
         您好，
 
         这是一封由 %{site_name} 自动发送的邮件，旨在通知您的帖子已被重新隐藏。
 
-        <%{base_url}}%{url}>
+        <%{base_url}%{url}>
 
         %{flag_reason}
 
@@ -2444,21 +2510,21 @@ zh_CN:
 
         有关其他指导，请参阅我们的[社区准则](%{base_url}/guidelines)。
     queued_by_staff:
-      title: "等待审核中"
-      subject_template: "帖子被管理员隐藏，等待批准"
+      title: "帖子需要审批"
+      subject_template: "帖子被管理人员隐藏，等待审批"
       text_body_template: |
-        Hello，
+        您好，
 
-        这是一条从 %{site_name} 发来的自动消息，，您的帖子已隐藏。
+        这是一封由 %{site_name} 自动发送的邮件，旨在通知您的帖子已被隐藏。
 
         <%{base_url}%{url}>
 
-        您的帖子将一直隐藏，直到管理员对其进行审核。
+        在管理人员审核之前，您的帖子将保持隐藏状态。
 
-        有关其他指导，请参阅我们的[社区准则](%{base_url}/guidelines)。
+        有关更多指导，请参阅我们的[社区准则](%{base_url}/guidelines)。
     flags_disagreed:
-      title: "管理人员恢复了被标记的帖子"
-      subject_template: "管理人员恢复了被标记的帖子"
+      title: "遭到举报的帖子被管理人员恢复"
+      subject_template: "遭到举报的帖子被管理人员恢复"
       text_body_template: |
         您好，
 
@@ -2472,8 +2538,8 @@ zh_CN:
         ```
         [/details]
     flags_agreed_and_post_deleted:
-      title: "管理人员删除了已标记的帖子"
-      subject_template: "管理人员删除了已标记的帖子"
+      title: "遭到举报的帖子被管理人员移除"
+      subject_template: "遭到举报的帖子被管理人员移除"
       text_body_template: |
         您好，
 
@@ -2490,9 +2556,9 @@ zh_CN:
         请阅读我们的[社区准则](%{base_url}/guidelines)以了解详情。
     usage_tips:
       text_body_template: |
-        要查看给新用户的简要技巧，[（英文）看看这篇博客文章](http://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/)。
+        有关作为新用户入门的一些快速提示，请[查看此博文](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/)。
 
-        只要您不断参与，我们将更了解您，并且新用户的临时限制将被移除。一段时间后您将获得[信任等级](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)，这将提供一些特殊功能来帮助我们更好地管理社区。
+        当您在这里参与时，我们将了解您，并且临时的新用户限制将被取消。随着时间的推移，您将获得[信任级别](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)，其中包括帮助我们共同管理社区的特殊权限。
     welcome_user:
       title: "欢迎用户"
       subject_template: "欢迎来到 %{site_name}！"
@@ -2501,56 +2567,56 @@ zh_CN:
 
         %{new_user_tips}
 
-        我们始终相信[讨论应该文明](%{base_url}/guidelines)。
+        我们始终相信[文明社区行为](%{base_url}/guidelines)。
 
         好好享受您在社区的时光吧！
     welcome_tl1_user:
-      title: "欢迎信任等级1用户"
+      title: "欢迎 TL1 用户"
       subject_template: "感谢与我们共度时光"
       text_body_template: |
-        嘿。我们看到您一直在忙着阅读，这太棒了，所以我们已经提升您了[信任等级！](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)
+        嘿！我们看到您一直在忙着阅读，这太棒了，所以我们提升了您的[信任级别](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)！
 
-        我们很高兴您和我们共度时光，我们很想知道更多关于您的事情。花一点时间[填写您的个人资料](%{base_url}/my/preferences/profile)，或随时[开始一个新话题](%{base_url}/categories)。
+        我们很高兴您和我们共度时光，我们很想详细地了解您。花一点时间[填写您的个人资料](%{base_url}/my/preferences/profile)，或者随时[开始一个新话题](%{base_url}/categories)。
     welcome_staff:
       title: "欢迎管理人员"
       subject_template: "恭喜，您已获得%{role}身份！"
       text_body_template: |
-        一位管理员已授予您%{role}身份。
+        一名管理人员已授予您%{role}身份。
 
-        作为一名%{role}，现在您可以访问<a href='%{base_url}/admin' target='_blank'>管理面板</a>。
+        作为一名%{role}，现在您可以访问<a href='%{base_url}/admin' target='_blank'>管理界面</a>。
 
-        拥有权利的同时也被赋予了重大的责任。如果您不熟悉管理，请参考[管理指南](https://meta.discourse.org/t/discourse-moderation-guide/63116)。
+        拥有权利的同时也需要承担重大责任。如果您不熟悉审核，请参阅[审核指南](https://meta.discourse.org/t/discourse-moderation-guide/63116)。
     welcome_invite:
       title: "欢迎邀请"
       subject_template: "欢迎来到 %{site_name}！"
       text_body_template: |
-        感谢您接受邀请加入%{site_name} —— 欢迎！
+        感谢您接受邀请加入 %{site_name} - 欢迎！
 
-        - 我们为您创建了账户**%{username}**。访问[您的用户设置][prefs]修改名字或密码。
+        - 我们为您创建了帐户 **%{username}**。访问[您的用户个人资料][prefs]修改名字或密码。
 
-        - 您登录的时候，请**使用收到邀请的邮箱地址**登录——否则我们就无法分辨是不是您本人！
+        - 请**使用原始邀请中的电子邮件地址**登录，否则我们无法分辨是不是您本人！
 
         - %{new_user_tips}
 
-        我们始终相信[讨论应该文明](%{base_url}/guidelines)。
+        我们始终相信[文明社区行为](%{base_url}/guidelines)。
 
-        好好享受您在论坛的时光吧！
+        好好享受您在社区的时光吧！
 
-        [prefs]: %{user_preferences_url}
+        [prefs]：%{user_preferences_url}
     tl2_promotion_message:
-      subject_template: "恭喜！您的信任等级提升了！"
+      subject_template: "恭喜您的信任级别提升！"
       text_body_template: |
-        我们已经为您提升到另一个[信任等级](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)！
+        我们已将您提升到另一个[信任级别](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)！
 
-        作为经验丰富的用户，您可能会喜欢[这个方便实用的技巧清单](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/)。
+        作为有经验的用户，您可能需要[这份方便的提示和技巧列表](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/)。
 
-        希望您能够继续活跃 —— 感谢您的参与。
+        我们邀请您继续参与 - 我们很高兴有您在身边。
     backup_succeeded:
       title: "备份成功"
       subject_template: "备份成功完成"
       text_body_template: |
         备份成功。
-        访问[管理 > 备份](%{base_url}/admin/backups)下载您的新备份。
+        访问[管理员 > 备份](%{base_url}/admin/backups)下载您的新备份。
 
         以下为日志：
 
@@ -2564,18 +2630,18 @@ zh_CN:
       text_body_template: |
         备份失败。
 
-        日志：
+        以下为日志：
 
         ```text
-        1%{logs}
+        %{logs}
         ```
     restore_succeeded:
-      title: "成功恢复"
+      title: "恢复成功"
       subject_template: "恢复成功完成"
       text_body_template: |
         恢复成功。
 
-        日志：
+        以下为日志：
 
         ```text
         %{logs}
@@ -2586,20 +2652,20 @@ zh_CN:
       text_body_template: |
         恢复失败。
 
-        日志：
+        以下为日志：
 
         ```text
         %{logs}
         ```
     bulk_invite_succeeded:
       title: "批量邀请成功"
-      subject_template: "批量用户邀请成功完成"
-      text_body_template: "您的批量邀请用户已经完成，发送了 %{sent} 个邀请。"
+      subject_template: "批量用户邀请处理成功"
+      text_body_template: "您的批量用户邀请文件已被处理，发送了 %{sent} 个邀请。"
     bulk_invite_failed:
       title: "批量邀请失败"
-      subject_template: "批量邀请完成，并有一些错误"
+      subject_template: "批量用户邀请已被处理，但存在错误"
       text_body_template: |
-        正在处理批量邀请用户文件中，%{sent}个邀请已经发送，其中有%{failed}个失败。
+        您的批量用户邀请已被处理，%{sent} 个邀请已发送，其中 %{failed} 个存在错误。
 
         以下为日志：
 
@@ -2607,436 +2673,435 @@ zh_CN:
         %{logs}
         ```
     user_added_to_group_as_owner:
-      title: "添加为群组的所有者"
+      title: "作为所有者被添加到群组"
       subject_template: "您已被添加为 %{group_name} 群组的所有者"
       text_body_template: |
         您已被添加为 [%{group_name}] (%{base_url}%{group_path}) 群组的所有者。
     user_added_to_group_as_member:
-      title: "添加为群组的成员"
+      title: "作为成员被添加到群组"
       subject_template: "您已被添加为 %{group_name} 群组的成员"
       text_body_template: |
         您已被添加为 [%{group_name}] (%{base_url}%{group_path}) 群组的成员。
     csv_export_succeeded:
-      title: "CSV导出成功"
-      subject_template: "[%{export_title}]数据导出完成"
+      title: "CSV 导出成功"
+      subject_template: "[%{export_title}] 数据导出完成"
       text_body_template: |
         您的数据导出成功！:dvd:
 
         %{download_link}
 
-        上方的下载地址将在 48 小时后失效。
+        以上下载链接的有效期为 48 小时。
 
-        用户数据以 Zip 格式归档。若归档文件无法在您打开时自动解压，请使用此处推荐的工具：https://www.7-zip.org/
+        数据被压缩为 zip 归档。如果归档在您打开时未自行解压缩，请使用此处推荐的工具：https://www.7-zip.org/
     csv_export_failed:
-      title: "导致CSV失败"
+      title: "CSV 导出失败"
       subject_template: "数据导出失败"
-      text_body_template: "我们很抱歉，但是您的数据导出请求失败了。请检查日志或[联系管理人员](%{base_url}/about)。"
+      text_body_template: "抱歉，您的数据导出失败。请查看日志或[联系管理人员](%{base_url}/about)。"
     email_reject_insufficient_trust_level:
-      title: "拒收邮件 信任等级不足"
-      subject_template: "[%{email_prefix}] 邮件问题 -- 信任等级不足"
+      title: "电子邮件被拒 - 信任级别不足"
+      subject_template: "[%{email_prefix}] 电子邮件问题 - 信任级别不足"
       text_body_template: |
-        我们很抱歉，但是您发送至%{destination}（名为 %{former_title}）的邮件出问题了。
+        抱歉，但是您向 %{destination}（名为 %{former_title}）发送的电子邮件未成功。
 
-        您的账户没有足够的信任等级以该邮件地址发布新话题。如果您有异议，[联系管理人员](%{base_url}/about)。
+        您的帐户没有所需的信任级别来将新话题发布到此电子邮件地址。如果您有异议，请[联系管理人员](%{base_url}/about)。
     email_reject_user_not_found:
-      title: "Email被拒绝：用户未找到"
-      subject_template: "[%{email_prefix}] 邮件问题 -- 未找到用户"
+      title: "电子邮件被拒 - 找不到用户"
+      subject_template: "[%{email_prefix}] 电子邮件问题 - 找不到用户"
       text_body_template: |
-        我们非常抱歉，但是您发送至 %{destination}（名为%{former_title}） 的邮件出问题了。
+        抱歉，但是您向 %{destination}（名为 %{former_title}）发送的电子邮件未成功。
 
-        您发送回复的邮件地址是未知的邮件地址。试试从另外一个邮件地址发送，或者[联系管理人员](%{base_url}/about)。
+        您的回复发送自未知电子邮件地址。尝试从其他电子邮件地址发送，或者[联系管理人员](%{base_url}/about)。
     email_reject_screened_email:
-      title: "Email 被拒绝：已屏蔽的 Email 地址"
-      subject_template: "[%{email_prefix}] 邮件问题 -- 被封禁的邮件地址"
+      title: "电子邮件被拒：被屏蔽的电子邮件"
+      subject_template: "[%{email_prefix}] 电子邮件问题 - 被禁止的电子邮件"
       text_body_template: |
-        我们非常抱歉，但是您发送至%{destination}（名为%{former_title}）的邮件出问题了。
+        抱歉，但是您向 %{destination}（名为 %{former_title}）发送的电子邮件未成功。
 
-        您发送回复的邮件地址是已被封禁的邮件地址。试试从另外一个邮件地址发送，或者[联系管理人员](%{base_url}/about)。
+        您的回复发送自被禁止的电子邮件地址。尝试从其他电子邮件地址发送，或者[联系管理人员](%{base_url}/about)。
     email_reject_not_allowed_email:
-      title: "邮件被拒绝：不被允许的邮件地址"
-      subject_template: "[%{email_prefix}] 邮件问题 -- 被封禁的邮件地址"
+      title: "电子邮件被拒：不允许的电子邮件"
+      subject_template: "[%{email_prefix}] 电子邮件问题 - 被禁止的电子邮件"
       text_body_template: |
-        我们非常抱歉，但是您发送至%{destination}（名为%{former_title}）的邮件出问题了。
+        抱歉，但是您向 %{destination}（名为 %{former_title}）发送的电子邮件未成功。
 
-        您发送回复的邮件地址是已被封禁的邮件地址。试试从另外一个邮件地址发送，或者[联系管理人员](%{base_url}/about)。
+        您的回复发送自被禁止的电子邮件地址。尝试从其他电子邮件地址发送，或者[联系管理人员](%{base_url}/about)。
     email_reject_inactive_user:
-      title: "Email被拒绝：未激活的用户"
-      subject_template: "[%{email_prefix}] 邮件问题 -- 未激活用户"
+      title: "电子邮件被拒：停用用户"
+      subject_template: "[%{email_prefix}] 电子邮件问题 - 停用用户"
       text_body_template: |
-        我们非常抱歉，但是您发送至 %{destination}（名为%{former_title}） 的邮件出问题了。
+        抱歉，但是您向 %{destination}（名为 %{former_title}）发送的电子邮件未成功。
 
-        与您账户关联的邮件地址没有激活，请先激活您的账户再发送邮件。
+        您与此电子邮件地址关联的帐户未被激活，请先激活您的帐户，然后再发送电子邮件。
     email_reject_silenced_user:
-      title: "Email 被拒绝：已禁言的用户"
-      subject_template: "[%{email_prefix}] 邮件问题——已禁言的用户"
+      title: "电子邮件被拒：被禁言的用户"
+      subject_template: "[%{email_prefix}] 电子邮件问题 - 被禁言的用户"
       text_body_template: |
-        我们非常抱歉，但是您发送至 （%{destination}题为 %{former_title}）的邮件出问题了。
+        抱歉，但是您向 %{destination}（名为 %{former_title}）发送的电子邮件未成功。
 
-        与您邮件地址关联的账户已被禁言。
+        您与此电子邮件地址关联的帐户已被禁言。
     email_reject_reply_user_not_matching:
-      title: "Email 被拒绝：用户不匹配"
-      subject_template: "[%{email_prefix}] 邮件问题 -- 未预期的回复地址"
+      title: "电子邮件被拒 - 用户不匹配"
+      subject_template: "[%{email_prefix}] 电子邮件问题 - 意外回复地址"
       text_body_template: |
-        我们非常抱歉，但是您发送至 %{destination}（名为%{former_title}） 的邮件出问题了。
+        抱歉，但是您向 %{destination}（名为 %{former_title}）发送的电子邮件未成功。
 
-        您发送回复的邮件地址与我们预期的地址不同，所以我们不确定您是不是同一个人。试试从另外一个邮件地址发送，或者[联系管理人员](%{base_url}/about)。
+        您的回复发送自与我们期望的地址不同的电子邮件地址，因此我们无法确定是否为同一个人。尝试从其他电子邮件地址发送，或者[联系管理人员](%{base_url}/about)。
     email_reject_empty:
-      title: "Email被拒绝：空"
-      subject_template: "[%{email_prefix}] 邮件问题 -- 无内容"
+      title: "电子邮件被拒：空"
+      subject_template: "[%{email_prefix}] 电子邮件问题 - 无内容"
       text_body_template: |
-        我们很抱歉，但是您发送至 %{destination}（名为 %{former_title}）的邮件没有成功。
+        抱歉，但是您向 %{destination}（名为 %{former_title}）发送的电子邮件未成功。
 
-        我们不能找到您邮件中的任何回复内容。
+        我们在您的电子邮件中找不到任何回复内容。
 
-        如果您**确定**您的邮件中有回复内容，试试用更简单的格式。
+        如果您收到此邮件，但您_确实_包含了回复，请使用更简单的格式重试。
     email_reject_parsing:
-      title: "邮件拒绝解析"
-      subject_template: "[%{email_prefix}] 邮件问题 -- 无法识别内容"
+      title: "电子邮件被拒：解析"
+      subject_template: "[%{email_prefix}] 电子邮件问题 - 内容无法识别"
       text_body_template: |
-        我们很抱歉，但是您发送至 %{destination}（名为 %{former_title}）的邮件无法发送。
+        抱歉，但是您向 %{destination}（名为 %{former_title}）发送的电子邮件未成功。
 
-        我们不能找到您邮件中的回复。**请确认将您的回复置于邮件顶端**——我们不能处理行内回复。
+        我们在电子邮件中找不到您的回复。**请确保您的回复位于电子邮件顶部** - 我们无法处理内嵌回复。
     email_reject_invalid_access:
-      title: "Email被拒绝：无效访问"
-      subject_template: "[%{email_prefix}] 邮件问题 -- 无效访问"
+      title: "电子邮件被拒：无效访问"
+      subject_template: "[%{email_prefix}] 电子邮件问题 - 无效访问"
       text_body_template: |
-        我们很抱歉，但是您发送至%{destination}（名为 %{former_title}）的邮件出问题了。
+        抱歉，但是您向 %{destination}（名为 %{former_title}）发送的电子邮件未成功。
 
-        您的账户没有达到足够的信任等级在该分类发布新话题。如果您有异议，[联系管理人员](%{base_url}/about)。
+        您的帐户没有权限在该类别下发布新话题。如果您有异议，请[联系管理人员](%{base_url}/about)。
     email_reject_strangers_not_allowed:
-      title: "Email被拒绝：不允许陌生人"
-      subject_template: "[%{email_prefix}] 邮件问题 -- 无效访问"
+      title: "电子邮件被拒：不允许陌生人"
+      subject_template: "[%{email_prefix}] 电子邮件问题 - 无效访问"
       text_body_template: |
-        我们非常抱歉，但是您发送至%{destination}（标题为%{former_title}）无效。
+        抱歉，但是您向 %{destination}（名为 %{former_title}）发送的电子邮件未成功。
 
-        邮件所发送的分类只接受来自拥有邮箱地址的有效账户的回复。如果您认为这是一个错误，[联系管理人员](%{base_url}/about)。
+        您将此电子邮件发送到的类别仅允许来自使用有效帐户和已知电子邮件地址的用户的回复。如果您有异议，请[联系管理人员](%{base_url}/about)。
     email_reject_invalid_post:
-      title: "邮件拒绝无效话题"
-      subject_template: "[%{email_prefix}] 邮件问题 -- 发表错误"
+      title: "电子邮件被拒：无效帖子"
+      subject_template: "[%{email_prefix}] 电子邮件问题 - 发帖错误"
       text_body_template: |
-        我们非常抱歉，但是您发送至%{destination}（名为%{former_title}）的邮件出问题了。
+        抱歉，但是您向 %{destination}（名为 %{former_title}）发送的电子邮件未成功。
 
-        可能的原因是：复杂的格式、私信超长、私信太短。请再试一次，如果还不行，使用网站发表。
+        可能的原因是：复杂的格式、消息过长、消息过短。请重试，如果问题仍然存在，请通过网站发帖。
     email_reject_invalid_post_specified:
-      title: "邮件拒绝指定的帖子无效"
-      subject_template: "[%{email_prefix}] 邮件问题 -- 发表错误"
+      title: "电子邮件被拒：指定的帖子无效"
+      subject_template: "[%{email_prefix}] 电子邮件问题 - 发帖错误"
       text_body_template: |
-        我们非常抱歉，但是您发送至%{destination}（名为%{former_title}）的邮件出问题了。
+        抱歉，但是您向 %{destination}（名为 %{former_title}）发送的电子邮件未成功。
 
         原因：
 
         %{post_error}
 
-        如果您能解决错误，请再试一次。
-      date_invalid: "没有找到帖子的创建时间。电子邮件是否缺少日期header？"
+        如果您可以解决问题，请重试。
+      date_invalid: "找不到帖子创建日期。电子邮件是否缺少 Date: 标头？"
     email_reject_post_too_short:
-      title: "邮件拒绝帖子过短"
-      subject_template: "[%{email_prefix}] 邮件问题 - 帖子过短"
+      title: "电子邮件被拒：帖子过短"
+      subject_template: "[%{email_prefix}] 电子邮件问题 - 帖子过短"
       text_body_template: |
-        很抱歉，您发送到%{destination}的邮件（标题%{former_title}）无效。
+        抱歉，但是您向 %{destination}（名为 %{former_title}）发送的电子邮件未成功。
 
-        为了促进更深入的对话，不允许进行非常简短的回复。您能回复至少%{count}个字符吗？或者回复“+1”来发送邮件。
+        为了促进更深入的对话，不允许进行非常简短的回复。您能回复至少 %{count} 个字符吗？或者，您也可以回复“+1”，通过电子邮件来点赞帖子。
     email_reject_invalid_post_action:
-      title: "邮件拒绝无效的帖子动作"
-      subject_template: "[%{email_prefix}] 邮件问题 -- 无效帖子动作"
+      title: "电子邮件被拒：无效的帖子操作"
+      subject_template: "[%{email_prefix}] 电子邮件问题 - 无效的帖子操作"
       text_body_template: |
-        我们非常抱歉，但是您发送至%{destination}（名为%{former_title}）的邮件出问题了。
+        抱歉，但是您向 %{destination}（名为 %{former_title}）发送的电子邮件未成功。
 
-        发送的命令无法被识别。请再试一次，如果还有问题，使用网站发表。
+        帖子操作无法被识别。请重试，如果问题仍然存在，请通过网站发帖。
     email_reject_reply_key:
-      title: "邮件拒绝回复键"
-      subject_template: "[%{email_prefix}] 邮件问题 -- 未知回复键"
+      title: "电子邮件被拒：回复键"
+      subject_template: "[%{email_prefix}] 电子邮件问题 - 未知回复键"
       text_body_template: |
-        我们非常抱歉，但是您发送至%{destination}（名为%{former_title}）的邮件出问题了。
+        抱歉，但是您向 %{destination}（名为 %{former_title}）发送的电子邮件未成功。
 
-        邮件中的回复信令是无效或者未知的，所以我们不知道这封邮件回复给谁了。请[联系管理人员](%{base_url}/about)。
+        电子邮件中的回复键无效或者未知，因此我们不知道此电子邮件回复给谁。请[联系管理人员](%{base_url}/about)。
     email_reject_bad_destination_address:
-      title: "Email被拒绝：收件人地址不正确"
-      subject_template: "[%{email_prefix}] 邮件问题 -- 未知的发至：地址"
+      title: "电子邮件被拒：回目标地址错误"
+      subject_template: "[%{email_prefix}] 电子邮件问题 - 未知收件人地址"
       text_body_template: |
-        很抱歉，但是您发送给 %{destination}  (标题 %{former_title}) 的电子邮件不起作用。
+        抱歉，但是您向 %{destination}（名为 %{former_title}）发送的电子邮件未成功。
 
         以下是一些需要检查的事项：
 
-          - 您使用多个电子邮件地址吗？您回复的电子邮件地址不同于原来使用的电子邮件地址吗？电子邮件回复要求您在回复时使用相同的电子邮件地址。
+          - 您是否使用多个电子邮件地址？您回复的电子邮件地址是否与您最初使用的电子邮件地址不同？电子邮件回复要求您在回复时使用相同的电子邮件地址。
 
-          - 回复时，您的电子邮件软件是否正确使用 Reply-To: email address？不幸的是，某些电子邮件软件错误地使用 From: address，这不起作用。
+          - 您的电子邮件软件在回复时是否正确使用了“回复给”电子邮件地址？不幸的是，一些电子邮件软件错误地将回复发送到“发件人”地址，在这种情况下将不成功。
 
-          - 电子邮件中的 Message-ID 标题是否已修改？Message-ID 必须保持一致且不变。
+          - 电子邮件中的 Message-ID 标头是否已被修改？Message-ID 必须一致且不变。
 
-        需要更多帮助？联系我们： %{base_url}/about
+        需要更多帮助？通过 %{base_url}/about 下的“联系我们”详细信息与我们联系
     email_reject_old_destination:
-      title: "邮件拒绝老地址"
-      subject_template: "[%{email_prefix}] 邮件问题 - 您正尝试回复旧通知"
+      title: "电子邮件被拒：旧目标"
+      subject_template: "[%{email_prefix}] 电子邮件问题 - 您正尝试回复旧通知"
       text_body_template: |
-        很抱歉，您发送到%{destination}的邮件（标题%{former_title}）无效。
+        抱歉，但是您向 %{destination}（名为 %{former_title}）发送的电子邮件未成功。
 
-        我们只接受%{number_of_days}天的原始通知回复。请[访问话题](%{short_url})继续对话。
+        我们只接受 %{number_of_days} 天的原始通知回复。请[访问话题](%{short_url})继续对话。
     email_reject_topic_not_found:
-      title: "Email被拒绝：话题不存"
-      subject_template: "[%{email_prefix}] 邮件问题 -- 话题未找到"
+      title: "电子邮件被拒 - 找不到话题"
+      subject_template: "[%{email_prefix}] 电子邮件问题 - 找不到话题"
       text_body_template: |
-        我们很抱歉，但是您发送至%{destination}（名为 %{former_title}）的邮件出问题了。
+        抱歉，但是您向 %{destination}（名为 %{former_title}）发送的电子邮件未成功。
 
-        您回复的话题不存在——可能已经被删除了？如果您有异议，[联系管理人员](%{base_url}/about)。
+        您正在回复的话题已不存在 - 也许它已被删除？如果您有异议，请[联系管理人员](%{base_url}/about)。
     email_reject_topic_closed:
-      title: "Email被拒绝：话题已关闭"
-      subject_template: "[%{email_prefix}] 邮件问题 -- 话题已关闭"
+      title: "电子邮件被拒 - 话题已被关闭"
+      subject_template: "[%{email_prefix}] 电子邮件问题 - 话题已被关闭"
       text_body_template: |
-        我们很抱歉，但是您发送至 %{destination} ( 名为 %{former_title} )的邮件出问题了。
+        抱歉，但是您向 %{destination}（名为 %{former_title}）发送的电子邮件未成功。
 
-        您回复的话题已经被关闭，不允许回复。如果您有异议，[联系管理人员](%{base_url}/about)。
+        您回复的话题已被关闭，不再接受回复。如果您有异议，请[联系管理人员](%{base_url}/about)。
     email_reject_auto_generated:
-      title: "邮件拒绝自动生成"
-      subject_template: "[%{email_prefix}] 邮件问题 -- 自动生成的回复"
+      title: "电子邮件被拒 - 自动生成"
+      subject_template: "[%{email_prefix}] 电子邮件问题 - 自动生成的回复"
       text_body_template: |
-        我们很抱歉，但是您发送至%{destination}（名为 %{former_title}）的邮件出问题了。
+        抱歉，但是您向 %{destination}（名为 %{former_title}）发送的电子邮件未成功。
 
-        系统觉得您的邮件是“自动生成”的，即电脑生成了该邮件而不是由您输入的；我们不能接受这样的邮件。如果您有异议，[联系管理人员](%{base_url}/about)。
+        您的电子邮件被标记为“自动生成”，这表示它是由计算机自动创建的，而不是由人输入的；我们不能接受这种电子邮件。如果您有异议，请[联系管理人员](%{base_url}/about)。
     email_reject_unrecognized_error:
-      title: "Email被拒绝：无法识别的错误"
-      subject_template: "[%{email_prefix}] 邮件问题 -- 无法识别的错误"
+      title: "电子邮件被拒 - 无法识别的错误"
+      subject_template: "[%{email_prefix}] 电子邮件问题 - 无法识别的错误"
       text_body_template: |
-        我们非常抱歉，但是您发送至%{destination}（名为%{former_title}）的邮件出问题了。
+        抱歉，但是您向 %{destination}（名为 %{former_title}）发送的电子邮件未成功。
 
-        在处理您的电子邮件时出现无法识别的错误，它并未发布。您可以再试一次，或者[联系管理人员](%{base_url}/about)。
+        处理您的电子邮件时出现无法识别的错误，因此您的邮件未被发布。您应当重试，或者[联系管理人员](%{base_url}/about)。
     email_reject_attachment:
-      title: "邮件附件被拒"
-      subject_template: "[%{email_prefix}] 邮件问题 -- 附件被拒"
+      title: "电子邮件附件被拒"
+      subject_template: "[%{email_prefix}] 电子邮件问题 - 附件被拒"
       text_body_template: |
-        很遗憾，您的邮件中的一些附件（%{destination}（标题%{former_title}）已被拒绝。
+        很抱歉，但是您向 %{destination}（名为 %{former_title}）发送的电子邮件中的一些附件被拒绝。
 
-        细节：
+        详细信息：
         %{rejected_errors}
 
-        如果您认为这是一个错误，[联系管理人员](%{base_url}/about)。
+        如果您有异议，请[联系管理人员](%{base_url}/about)。
     email_reject_reply_not_allowed:
-      title: "邮件被拒绝：不允许回复"
-      subject_template: "[%{email_prefix}]邮件问题 -- 不允许回复"
+      title: "电子邮件被拒：不允许回复"
+      subject_template: "[%{email_prefix}] 电子邮件问题 - 不允许回复"
       text_body_template: |
-        我们很抱歉，但是您发送至%{destination}（标题 %{former_title}）的邮件出问题了。
+        抱歉，但是您向 %{destination}（名为 %{former_title}）发送的电子邮件未成功。
 
-        您的账户没有权限回复这个话题。如果您认为这是一个错误，[联系管理人员](%{base_url}/about)。
+        您没有权限回复该话题。如果您有异议，请[联系管理人员](%{base_url}/about)。
     email_reject_reply_to_digest:
-      title: "回复摘要邮件被拒"
-      subject_template: "[%{email_prefix}] 邮件问题 -- 回复摘要邮件"
+      title: "电子邮件被拒：回复摘要"
+      subject_template: "[%{email_prefix}] 电子邮件问题 - 回复摘要"
       text_body_template: |
-        抱歉，您发送到%{destination}（标题为%{former_title}）的邮件出现了问题。
+        抱歉，但是您向 %{destination}（名为 %{former_title}）发送的电子邮件未成功。
 
-        我们不接受直接回复摘要邮件。
+        我们不接受回复摘要电子邮件。
 
-        如果您认为这是一个错误，[联系我们的管理人员](%{base_url}/about).
+        如果您有异议，请[联系管理人员](%{base_url}/about)。
     email_error_notification:
-      title: "邮件错误提醒"
-      subject_template: "[%{email_prefix}] 电子邮件错误 -- POP 验证错误"
+      title: "电子邮件错误通知"
+      subject_template: "[%{email_prefix}] 电子邮件问题 - POP 身份验证错误"
       text_body_template: |
-        不幸的是，从 POP 服务器查询邮件时遇到了验证错误。
+        很抱歉，从 POP 服务器轮询邮件时出现身份验证错误。
 
-        请确认您在[站点设置](%{base_url}/admin/site_settings/category/email)中已经正确配置了 POP 验证信息。
+        请确保您在[站点设置](%{base_url}/admin/site_settings/category/email)中正确配置了 POP 凭据。
 
-        如果 POP 邮件账户有图形界面，您可以登录后查看邮箱设置。
+        如果 POP 电子邮件帐户有 Web UI，您可能需要登录 Web 并在那里检查您的设置。
     email_revoked:
-      title: "邮件撤销"
-      subject_template: "您的邮箱地址是否正确？"
+      title: "电子邮件已撤消"
+      subject_template: "您的电子邮件地址是否正确？"
       text_body_template: |
-        很抱歉，我们无法通过邮件与您联系。我们最后几封给您的邮件都因无法投递而全部退回。
+        抱歉，我们无法通过电子邮件与您联系。我们给您发送的最后几封电子邮件都因无法投递而被全部退回。
 
-        您能否确保[您的邮件地址](%{base_url}/我的/设置/邮件)有效且有效？您可能还希望将我们的邮件地址添加到您的地址簿/联系人列表中，以提高可投递性。
+        您能否确保[您的邮件地址](%{base_url}/my/preferences/email)有效？您可能还需要将我们的电子邮件地址添加到您的地址簿/联系人列表中，以提高成功投递几率。
     email_bounced: |
-      %{email}的邮件已退回。
+      发送至 %{email} 的邮件被退回。
 
-      ### 细节
+      ### 详细信息
 
       ```text
       %{raw}
       ```
     ignored_users_summary:
-      title: "忽视的用户超过了阈值"
-      subject_template: "一名用户被许多其他用户忽视"
+      title: "忽略的用户超过阈值"
+      subject_template: "一个用户被许多其他用户忽略"
       text_body_template: |
         您好，
 
-        这是 %{site_name} 告知您 @%{username} 已被 %{ignores_threshold} 名用户忽略的自动消息。这可能表示您的社区已开始产生问题。
+        这是一封由 %{site_name} 自动发送的邮件，旨在通知您 %{username} 已被 %{ignores_threshold} 个用户忽略。这可能表示您的社区已开始出现问题。
 
-        您可能想查阅[此用户的近期发帖](%{base_url}/u/%{username}/summary)和[忽略及禁言汇报](%{base_url}/admin/reports/top_ignored_users)中的其他用户。
+        您可能需要审核此用户以及[被忽略和被设为免打扰的用户报告](%{base_url}/admin/reports/top_ignored_users)中的其他用户[最近的帖子](%{base_url}/u/%{username}/summary)。
 
-        若您需要额外帮助，请参见我们的[社区准则](%{base_url}/guidelines)。
+        有关其他指导，请参阅我们的[社区准则](%{base_url}/guidelines)。
     too_many_spam_flags:
-      title: "太多垃圾标记"
-      subject_template: "新账户被搁置"
+      title: "垃圾信息举报过多"
+      subject_template: "新帐户被暂停"
       text_body_template: |
         您好，
 
         这是一封由 %{site_name} 自动发送的邮件，旨在通知由于您的帖子被社区举报，它们已被暂时隐藏。
 
-        作为预防措施，您的新帐户已被禁言，并且在管理人员审查您的帐户前您无法创建回复或话题。对于任何不便之处，我们深表歉意。
+        作为预防措施，您的新帐户已被禁言，并且在管理人员审核您的帐户前您无法创建回复或话题。对于任何不便之处，我们深表歉意。
 
         有关其他指导，请参阅我们的[社区准则](%{base_url}/guidelines)。
     too_many_tl3_flags:
-      title: "太多信任等级3用户标记"
-      subject_template: "新账户被暂时封禁"
+      title: "TL3 举报过多"
+      subject_template: "新帐户被暂停"
       text_body_template: |
         您好，
 
-        这是%{site_name}通知您的帖子因社区标记而被临时禁用的自动消息。
+        这是一封由 %{site_name} 自动发送的邮件，旨在通知您由于大量社区举报，您的帐户已被暂停。
 
-        出于谨慎的考虑，在管理人员审核通过前，您的新账户不能再发表新的回复或者话题。我们对此带来的不便表示歉意。
+        作为预防措施，您的新帐户已被禁止创建新回复或话题，直到管理人员可以审核您的帐户。对于任何不便之处，我们深表歉意。
 
-        要查看更多指引，请参考我们的[社区指引](%{base_url}/guidelines)。
+        有关其他指导，请参阅我们的[社区准则](%{base_url}/guidelines)。
     silenced_by_staff:
       title: "被管理人员禁言"
-      subject_template: "账户临时被禁用"
+      subject_template: "帐户被临时暂停"
       text_body_template: |
         您好，
 
-        %{site_name}提醒您，出于谨慎起见您的账户已被暂时停用。
+        这是一封由 %{site_name} 自动发送的邮件，旨在通知您，作为预防措施您的帐户已被临时暂停。
 
-        您可以继续浏览，但在[管理人员](%{base_url}/about)审核您最近的发帖前，您的账户将无法发表新的回复或者话题。我们对此带来的不便表示歉意。
+        您可以继续浏览，但在[管理人员](%{base_url}/about)审核您最近的帖子前，您将无法回复或者创建话题。对于任何不便之处，我们深表歉意。
 
-        要查看更多指引，请参阅我们的[社区指引](%{base_url}/guidelines)。
+        有关其他指导，请参阅我们的[社区准则](%{base_url}/guidelines)。
     user_automatically_silenced:
-      title: "用户自动被禁用"
-      subject_template: "新用户%{username}因社区标记被封禁"
+      title: "用户被自动禁言"
+      subject_template: "新用户 %{username} 因社区举报被禁言"
       text_body_template: |
-        这是自动发出消息。
+        这是一封自动发送的邮件。
 
-        因多位用户标记%{username}的帖子，新用户[%{username}](%{user_url})已被自动禁言。
+        由于多个用户举报了 %{username} 的帖子，新用户 [%{username}](%{user_url}) 已被自动禁言。
 
-        请[查看这些标记](%{base_url}/admin/flags)。如果%{username}被意外禁言，点击[该用户管理页面](%{user_url})内的解除禁言按钮。
+        请[审核举报](%{base_url}/admin/flags)。如果 %{username} 被意外禁言，请点击[此用户管理页面](%{user_url})上的取消禁言按钮。
 
-        该阈值可以通过站点设置中的 `silence_new_user` 更改。
+        此阈值可以通过 `silence_new_user` 站点设置更改。
     spam_post_blocked:
-      title: "垃圾帖子被封锁"
-      subject_template: "新用户 %{username} 因重复发布链接而被禁止发表相关帖子"
+      title: "垃圾信息帖子被屏蔽"
+      subject_template: "新用户 %{username} 的帖子因重复链接被屏蔽"
       text_body_template: |
-        这是一则自动消息。
+        这是一封自动发送的邮件。
 
-        新用户[%{username}](%{user_url})尝试创建多个链接到%{domains}的帖子，但是这些帖子都因反垃圾被屏蔽了。该用户仍能够创建没有链接到%{domains}的帖子。
+        新用户 [%{username}](%{user_url}) 尝试创建多个带有指向 %{domains} 的链接的帖子，但这些帖子被屏蔽以避免垃圾信息。该用户仍然可以创建未链接到 %{domains} 的新帖子。
 
-        请[审核该用户](%{user_url})。
+        请[审核用户](%{user_url})。
 
-        可以在站点设置的`newuser_spam_host_threshold` 和`allowed_spam_host_domains` 中修改。如果应该被豁免，考虑将%{domains}添加到允许列表。
+        可以通过 `newuser_spam_host_threshold` 和 `allowed_spam_host_domains` 站点设置对此进行修改。如果他们应该被豁免，请考虑将 %{domains} 添加到许可名单中。
     unsilenced:
-      title: "解除禁言"
-      subject_template: "账户不再被挂起"
+      title: "已被取消禁言"
+      subject_template: "帐户不再处于暂停状态"
       text_body_template: |
         您好，
 
-        这是%{site_name}通知您的账户在管理人员审核后不再受到限制的自动消息。
+        这是一封由 %{site_name} 自动发送的邮件，旨在通知您的帐户在管理人员审核后不再处于暂停状态。
 
-        您现在又可以创建回复和话题了。感谢您的耐心等待。
+        您现在又可以创建新回复和话题了。感谢您的耐心等待。
     pending_users_reminder:
-      title: "待审核用户提醒"
+      title: "待处理用户提醒"
       subject_template:
-        other: "%{count} 个用户等待批准"
+        other: "%{count} 个用户等待审批"
       text_body_template: |
-        有新注册的用户在访问论坛前需要被批准（或者拒绝）。
+        有新注册的用户正在等待被批准（或者拒绝），以便他们可以访问此论坛。
 
         [请审核他们](%{base_url}/admin/users/list/pending)。
     download_remote_images_disabled:
-      title: "已被禁止下载远程图片"
-      subject_template: "远程图片下载已禁用。"
-      text_body_template: "`download_remote_images_to_local` 设定已被禁用，因为已经达到 ``download_remote_images_threshold` 设定中的磁盘空间限制。"
+      title: "下载远程图片已被禁用"
+      subject_template: "下载远程图片已被禁用"
+      text_body_template: "由于达到了 `download_remote_images_threshold` 的磁盘空间限制，`download_remote_images_to_local` 设置被禁用。"
     dashboard_problems:
-      title: "管理面板问题"
-      subject_template: "站点仪表盘的新建议"
+      title: "信息中心问题"
+      subject_template: "站点信息中心的新建议"
       text_body_template: |
-        基于您目前的网站设置，我们有一些新的建议和推荐。
+        基于您目前的站点设置，我们有一些新的建议和推荐。
 
-        [访问您的仪表板](%{base_url}/admin)来查看他们。
+        [访问您的站点信息中心](%{base_url}/admin)以查看。
 
-        如果您的仪表板上没有任何可见的内容，那么另一个工作人员可能已经根据这些建议采取了行动。
-
-        可以查看[管理人员操作日志](%{base_url}/admin/logs/staff_action_logs)。
+        如果您的信息中心没有任何可见的内容，则可能是另一个管理人员已经根据这些建议采取了行动。可以在[管理人员操作日志](%{base_url}/admin/logs/staff_action_logs)中找到管理人员操作列表。
     new_user_of_the_month:
-      title: "您是这个月的最佳新用户！"
-      subject_template: "您是这个月的最佳新用户！"
+      title: "您是当月最佳新用户！"
+      subject_template: "您是当月最佳新用户！"
       text_body_template: |
-        恭喜，你是**%{month_year}月最佳新用户**。 :trophy:
+        恭喜，您获得了 ** %{month_year}**当月最佳新用户奖。:trophy:
 
-        该奖项每月只授予给两位新用户，并且你永远都可以在[你的用户页](%{base_url}/my/badges)找到。
+        此奖项每月仅授予两名新用户，并且将在[徽章页面](%{url})上永久可见。
 
-        你迅速成为了我们社区中的宝贵一员。感谢你的参与，未来继续努力！
+        您很快就成为我们社区的重要成员。感谢您的加入，继续努力！
     queued_posts_reminder:
-      title: "待处理帖子提醒"
+      title: "队列帖子提醒"
       subject_template:
         other: "%{count} 个帖子等待审核"
       text_body_template: |
         您好，
 
-        为了保持适度新用户的帖子，正在等待审核。[批准还是拒绝](%{base_url}/review?type=ReviewableQueuedPost)。
+        新用户的帖子目前正在等待审核。[在此处批准或拒绝他们](%{base_url}/review?type=ReviewableQueuedPost)。
   unsubscribe_link: |
-    要退订这些邮件，[点击这里](%{unsubscribe_url})。
+    要退订这些电子邮件，请[点击此处](%{unsubscribe_url})。
   unsubscribe_link_and_mail: |
-    要退订这些邮件，[点击这里](%{unsubscribe_url})。
+    要退订这些电子邮件，请[点击此处](%{unsubscribe_url})。
   unsubscribe_mailing_list: |
-    您启用了邮件列表模式，所以收到了这些邮件。
+    您收到此邮件是因为您启用了邮寄名单模式。
 
-    要退订这些邮件，[点击这里](%{unsubscribe_url})。
-  subject_re: "回："
-  subject_pm: "[私信]"
-  email_from: "%{site_name}的%{user_name}"
+    要退订这些电子邮件，请[点击此处](%{unsubscribe_url})。
+  subject_re: "回复："
+  subject_pm: "[PM]"
+  email_from: "%{user_name} 通过 %{site_name}"
   user_notifications:
-    previous_discussion: "之前的回复"
+    previous_discussion: "以前的回复"
     reached_limit:
-      other: "注意：我们每天最多发送 %{count} 邮件。访问站点看看没被发送的消息。还有您很火！"
+      other: "注意：我们每天最多发送 %{count} 封电子邮件。检查站点以查看可能被阻止的电子邮件。 PS：您很受欢迎！"
     in_reply_to: "回复给"
     unsubscribe:
-      title: "取消订阅"
-      description: "不再对这些邮件感兴趣？没问题！点击下面按钮来立即取消订阅："
-    reply_by_email: "[访问话题](%{base_url}%{url})或者发邮件回复。"
-    reply_by_email_pm: "[访问消息](%{base_url}%{url})或用邮件回复%{participants}。"
-    only_reply_by_email: "发邮件回复。"
-    only_reply_by_email_pm: "用邮件回复%{participants}。"
-    visit_link_to_respond: "[访问话题](%{base_url}%{url})以回复."
-    visit_link_to_respond_pm: "[访问消息](%{base_url}%{url})回复%{participants}。"
-    posted_by: "%{username}发表于%{post_date}"
+      title: "退订"
+      description: "不再对这些电子邮件感兴趣？没问题！点击下面的按钮可以立即退订："
+    reply_by_email: "[访问话题](%{base_url}%{url})或者回复此电子邮件以进行回复。"
+    reply_by_email_pm: "[访问消息](%{base_url}%{url})或者回复此电子邮件以回复 %{participants}。"
+    only_reply_by_email: "回复此电子邮件以进行回复。"
+    only_reply_by_email_pm: "回复此电子邮件以回复 %{participants}。"
+    visit_link_to_respond: "[访问话题](%{base_url}%{url})以回复。"
+    visit_link_to_respond_pm: "[访问消息](%{base_url}%{url})以回复 %{participants}。"
+    reply_above_line: "## 请在此行上方输入您的回复。##"
+    posted_by: "由 %{username} 于 %{post_date}发表"
     pm_participants: "参与者：%{participants}"
     invited_group_to_private_message_body: |
-      %{username}邀请@%{group_name}到私信
+      %{username} 邀请 @%{group_name} 加入消息
 
       > **[%{topic_title}](%{topic_url})**
       >
       > %{topic_excerpt}
 
-      位于
+      -
 
       > %{site_title} -- %{site_description}
 
-      点击以下链接加入私信：
+      要加入消息，请点击以下链接：
 
       %{topic_url}
     invited_to_private_message_body: |
-      %{username}邀请您参与私信
+      %{username} 邀请您加入消息
 
       > **[%{topic_title}](%{topic_url})**
       >
       > %{topic_excerpt}
 
-      位于
+      -
 
       > %{site_title} -- %{site_description}
 
-      点击以下链接加入私信：
+      要加入消息，请点击以下链接：
 
       %{topic_url}
     invited_to_topic_body: |
-      %{username}邀请您参与讨论
+      %{username} 邀请您加入讨论
 
       > **[%{topic_title}](%{topic_url})**
       >
       > %{topic_excerpt}
 
-      位于
+      -
 
       > %{site_title} -- %{site_description}
 
-      点击以下链接加入讨论：
+      要加入讨论，请点击以下链接：
 
       %{topic_url}
     user_invited_to_private_message_pm_group:
-      title: "用户邀请群组至私信"
-      subject_template: "[%{email_prefix}] %{username}邀请 @%{group_name} 加入消息交流：“%{topic_title}”"
+      title: "用户邀请群组加入 PM"
+      subject_template: "[%{email_prefix}] %{username} 邀请 @%{group_name} 加入消息 '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
 
@@ -3044,8 +3109,8 @@ zh_CN:
 
         %{respond_instructions}
     user_invited_to_private_message_pm:
-      title: "邀请用户至私信"
-      subject_template: "[%{email_prefix}] %{username}邀请您至私信“%{topic_title}”"
+      title: "用户邀请加入 PM"
+      subject_template: "[%{email_prefix}] %{username} 邀请您加入消息 '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
 
@@ -3053,8 +3118,8 @@ zh_CN:
 
         %{respond_instructions}
     user_invited_to_private_message_pm_staged:
-      title: "邀请用户至暂存私信"
-      subject_template: "[%{email_prefix}] %{username}邀请您至私信“%{topic_title}”"
+      title: "用户邀请加入 PM 暂存"
+      subject_template: "[%{email_prefix}] %{username} 邀请您加入消息 '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
 
@@ -3062,8 +3127,8 @@ zh_CN:
 
         %{respond_instructions}
     user_invited_to_topic:
-      title: "邀请用户至话题"
-      subject_template: "[%{email_prefix}] %{username}邀请您至“%{topic_title}”"
+      title: "用户邀请加入话题"
+      subject_template: "[%{email_prefix}] %{username} 邀请您加入 '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
 
@@ -3082,8 +3147,8 @@ zh_CN:
 
         %{respond_instructions}
     user_replied_pm:
-      title: "用户回复私信"
-      subject_template: "[%{email_prefix}] [私信] %{topic_title}"
+      title: "用户回复 PM"
+      subject_template: "[%{email_prefix}] [PM] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -3126,7 +3191,7 @@ zh_CN:
 
         %{respond_instructions}
     user_mentioned_pm:
-      title: "用户提及PM"
+      title: "用户提及 PM"
       subject_template: "[%{email_prefix}] [PM] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -3148,7 +3213,7 @@ zh_CN:
 
         %{respond_instructions}
     user_posted:
-      title: "用户发表"
+      title: "用户发帖"
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -3159,7 +3224,7 @@ zh_CN:
 
         %{respond_instructions}
     user_watching_first_post:
-      title: "用户关注新话题"
+      title: "用户关注第一个帖子"
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -3170,8 +3235,8 @@ zh_CN:
 
         %{respond_instructions}
     user_posted_pm:
-      title: "用户发布私信"
-      subject_template: "[%{email_prefix}] [私信] %{topic_title}"
+      title: "用户发布 PM"
+      subject_template: "[%{email_prefix}] [PM] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -3181,81 +3246,81 @@ zh_CN:
 
         %{respond_instructions}
     user_posted_pm_staged:
-      title: "用户发表暂存私信"
+      title: "用户发布 PM 暂存"
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
         %{message}
     account_suspended:
-      title: "账户已封禁"
-      subject_template: "[%{email_prefix}] 您的账户已经被禁用"
+      title: "帐户被封禁"
+      subject_template: "[%{email_prefix}] 您的帐户已被封禁"
       text_body_template: |
-        您的账号已被论坛禁用，直到 %{suspended_till} 为止。
+        您的帐户被论坛封禁至 %{suspended_till}。
 
         原因 - %{reason}
     account_silenced:
-      title: "账户已禁言"
-      subject_template: "[%{email_prefix}] 您的账户已被禁言"
+      title: "帐户被禁言"
+      subject_template: "[%{email_prefix}] 您的帐户已被禁言"
       text_body_template: |
-        您的账号已经被禁言至 %{silenced_till}。
+        您的帐户被论坛禁言至 %{silenced_till}。
 
         原因 - %{reason}
     account_exists:
-      title: "账户已经存在"
-      subject_template: "[%{email_prefix}] 账户已经存在"
+      title: "帐户已存在"
+      subject_template: "[%{email_prefix}] 帐户已存在"
       text_body_template: |
-        您刚试着在%{site_name}创建账户或者试着将账户的邮箱改为%{email}。然而，%{email}已经绑定于另一账户了。
+        您刚刚尝试在 %{site_name} 创建帐户，或者尝试将帐户的电子邮件更改为 %{email}。但是，已经存在使用 %{email} 的帐户。
 
-        如果您忘记了密码，[立即重置](%{base_url}/password-reset)。
+        如果您忘记了密码，请[立即重置](%{base_url}/password-reset)。
 
-        如果您没有试着用%{email}创建账户或者更改邮件，不要担心——您可以安全地忽略这封邮件。
+        如果您没有尝试为 %{email} 创建帐户或更改您的电子邮件地址，请不要担心，您可以直接忽略此消息。
 
-        如果您有任何问题，[联系我们友善的工作人员](%{base_url}/about)。
+        如果您有任何问题，请[联系我们友好的管理人员](%{base_url}/about)。
     account_second_factor_disabled:
-      title: "双重认证已停用"
-      subject_template: "[%{email_prefix}] 双重认证已停用"
+      title: "双重身份验证已禁用"
+      subject_template: "[%{email_prefix}] 双重身份验证已禁用"
       text_body_template: |
-        您在 %{site_name} 的账户已停用了双重认证。您现在只需使用密码便可以登录；不再需要额外的验证代码。
+        您在 %{site_name} 的帐户的双重身份验证已被禁用。您现在可以仅使用您的密码登录；不再需要额外的身份验证代码。
 
-        如果您未选择禁用双重验证，则有可能有人入侵了您的账户。
+        如果您没有选择禁用双重身份验证，则可能有人盗用了您的帐户。
 
-        如果有任何疑问，[联系我们友善的管理人员](%{base_url}/about)。
+        如果您有任何问题，请[联系我们友好的管理人员](%{base_url}/about)。
     digest:
-      why: "在您上次于%{last_seen_at}访问后，%{site_link}的新内容摘要。"
-      since_last_visit: "自从您上次访问"
+      why: "自 %{last_seen_at} 您上次访问后 %{site_link} 的简短摘要"
+      since_last_visit: "自从您上次访问以来"
       new_topics: "新话题"
       unread_notifications: "未读通知"
-      unread_high_priority: "未读的高优先级通知"
-      liked_received: "收到的赞"
+      unread_high_priority: "未读高优先级通知"
+      liked_received: "获赞"
       new_users: "新用户"
       popular_topics: "热门话题"
-      follow_topic: "关注话题"
+      follow_topic: "关注此话题"
       join_the_discussion: "阅读更多"
-      popular_posts: "流行帖子"
-      more_new: "您关注的新帖"
+      popular_posts: "热门帖子"
+      more_new: "新摘要"
       subject_template: "[%{email_prefix}] 摘要"
-      unsubscribe: "这是来自%{site_link}的摘要邮件，因为您长时间没有访问站点而发送。修改您的邮件设置%{email_preferences_link}，或%{unsubscribe_link}取消订阅。"
-      your_email_settings: "您的邮件设置"
+      unsubscribe: "此摘要发送自 %{site_link}，我们已经有一段时间没有看到您了。更改%{email_preferences_link}或%{unsubscribe_link}以退订。"
+      your_email_settings: "您的电子邮件设置"
       click_here: "点击此处"
       from: "%{site_name}"
-      preheader: "在您上次于%{last_seen_at}访问后的新内容摘要"
+      preheader: "自 %{last_seen_at} 您上次访问后的简短摘要"
     forgot_password:
       title: "忘记密码"
       subject_template: "[%{email_prefix}] 密码重置"
       text_body_template: |
-        在[%{site_name}](%{base_url})上有人要求重置您的密码。
+        有人要求重置您在 [%{site_name}](%{base_url}) 上的密码。
 
-        如果不是您，您可以安全地忽略此邮件。
+        如果不是您，您可以直接忽略此电子邮件。
 
-        点击以下链接设置新密码：
+        点击下方链接设置新密码：
         %{base_url}/u/password-reset/%{email_token}
     email_login:
-      title: "用链接登录"
-      subject_template: "[%{email_prefix}]链接登录"
+      title: "通过链接登录"
+      subject_template: "[%{email_prefix}] 通过链接登录"
       text_body_template: |
-        这是您用于登录[%{site_name}](%{base_url})的链接
+        这是您用于登录 [%{site_name}](%{base_url}) 的链接
 
-        如果您未请求过此链接，可以放心地忽略此电子邮件。
+        如果您未请求此链接，您可以直接忽略此电子邮件。
 
         点击下方链接登录：
         %{base_url}/session/email-login/%{email_token}
@@ -3263,228 +3328,229 @@ zh_CN:
       title: "设置密码"
       subject_template: "[%{email_prefix}] 设置密码"
       text_body_template: |
-        有人尝试设置您在 [%{site_name}](%{base_url}) 的密码。除此之外，您可以从已验证过您邮件地址的在线服务商登录。
+        有人要求为您在 [%{site_name}](%{base_url}) 上的帐户设置密码。您也可以使用与此经过验证的电子邮件地址关联的任何受支持在线服务（Google、Facebook 等）登录。
 
-        如果不是您在请求添加密码，您可以直接忽略本邮件。
+        如果您没有发出此请求，您可以直接忽略此电子邮件。
 
-        点击下面的链接来选择设置密码：
+        点击下方链接设置密码：
         %{base_url}/u/password-reset/%{email_token}
     admin_login:
       title: "管理员登录"
       subject_template: "[%{email_prefix}] 登录"
       text_body_template: |
-        有人要登录您在[%{site_name}](%{base_url})上的账户。
+        有人要求登录您在 [%{site_name}](%{base_url}) 上的帐户。
 
-        如果您没有发出此请求，则可以放心地忽略此电子邮件。
+        如果您没有发出此请求，您可以直接忽略此电子邮件。
 
-        单击以下链接登录：
+        点击下方链接登录：
         %{base_url}/session/email-login/%{email_token}
     account_created:
-      title: "账户已创建"
-      subject_template: "[%{email_prefix}] 您的新账户"
+      title: "帐户已创建"
+      subject_template: "[%{email_prefix}] 您的新帐户"
       text_body_template: |
-        %{site_name}已经为您创建了新账户
+        已在 %{site_name} 为您创建一个新帐户
 
-        点击下面的链接设置新账户密码：
+        点击下方链接为您的新帐户设置密码：
         %{base_url}/u/password-reset/%{email_token}
     confirm_new_email:
-      title: "确认新邮箱"
-      subject_template: "[%{email_prefix}] 确认您的新电子邮箱地址"
+      title: "确认新电子邮件"
+      subject_template: "[%{email_prefix}] 确认您的新电子邮件地址"
       text_body_template: |
-        点击以下链接确认您在 %{site_name} 的新电子邮件地址：
+        点击下方链接确认您在 %{site_name} 使用的新电子邮件地址：
 
         %{base_url}/u/confirm-new-email/%{email_token}
 
-        如果您没有要求此更改，请联系管理员 (%{base_url}/about) 。
+        如果您没有请求此变更，请联系[站点管理员](%{base_url}/about)。
     confirm_new_email_via_admin:
-      title: "确认新邮箱"
-      subject_template: "[%{email_prefix}] 确认您的新电子邮箱地址"
+      title: "确认新电子邮件"
+      subject_template: "[%{email_prefix}] 确认您的新电子邮件地址"
       text_body_template: |
-        点击以下链接确认您在%{site_name}的新电子邮件地址：
+        点击下方链接确认您在 %{site_name} 使用的新电子邮件地址：
 
         %{base_url}/u/confirm-new-email/%{email_token}
 
-        此电子邮件的更改由网站管理员发送。如果您没有要求此更改，请联系管理员(%{base_url}/about)。
+        此电子邮件变更由站点管理员请求。如果您没有请求此变更，请联系[站点管理员](%{base_url}/about)。
     confirm_old_email:
-      title: "确认旧邮箱"
-      subject_template: "[%{email_prefix}] 确认您现在的电子邮箱地址"
+      title: "确认旧电子邮件"
+      subject_template: "[%{email_prefix}] 确认您当前的电子邮件地址"
       text_body_template: |
-        在我们更改您的邮件地址前，我们需要确认您掌控当前邮件账户。在您完成这一步后，我们会让您确认新的邮件地址。
+        在我们更改您的电子邮件地址之前，我们需要您确认您可以控制当前的电子邮件帐户。完成此步骤后，我们将让您确认新电子邮件地址。
 
-        点击下面链接以确认您当前在%{site_name}的邮件地址：
+        点击下方链接，确认您当前的电子邮件地址 %{site_name}
 
         %{base_url}/u/confirm-old-email/%{email_token}
     confirm_old_email_add:
-      title: "确认旧邮箱（添加）"
-      subject_template: "[%{email_prefix}] 确认您现在的电子邮箱地址"
+      title: "确认旧电子邮件（添加）"
+      subject_template: "[%{email_prefix}] 确认您当前的电子邮件地址"
       text_body_template: |
-        在我们添加新的电子邮件地址之前，我们需要确认您掌控当前的电子邮件账户。在您完成这一步后，我们会让您确认新的电子邮件地址。
+        在我们添加新的电子邮件地址之前，我们需要您确认您可以控制当前的电子邮件帐户。完成此步骤后，我们将让您确认新电子邮件地址。
 
-        点击以下链接，确认您当前在%{site_name}电子邮件地址：
+        点击下方链接，确认您当前的电子邮件地址 %{site_name}
 
         %{base_url}/u/confirm-old-email/%{email_token}
     notify_old_email:
-      title: "通知旧邮箱"
-      subject_template: "[%{email_prefix}] 您的邮箱已经修改成功"
+      title: "通知旧电子邮件"
+      subject_template: "[%{email_prefix}] 您的电子邮件地址已更改"
       text_body_template: |
-        这是%{site_name}自动发出的邮件，以告知您的邮箱地址已经被修改了。如果这是一个错误，请联系站点管理人员。
+        这是一封自动发送的邮件，旨在通知您为 %{site_name} 使用的电子邮件地址已更改。如果有误，请联系站点管理员。
 
-        您的邮箱地址被修改为：
+        您的电子邮件地址已更改为：
 
         %{new_email}
     notify_old_email_add:
-      title: "通知旧邮件（添加）"
-      subject_template: "[%{email_prefix}]一个新的电子邮件已被添加。"
+      title: "通知旧电子邮件（添加）"
+      subject_template: "[%{email_prefix}] 已添加新的电子邮件地址"
       text_body_template: |
-        请了解，这是一条自动的私信/消息，这个电子邮件地址
-        已添加至%{site_name}。如果有误，请联系
-        网站管理员。
+        这是一封自动发送的邮件，旨在通知您为 %{site_name} 使用的电子邮件地址已添加。如果有误，请联系站点管理员。
 
-        您添加的电子邮件地址是：
+        添加的电子邮件地址为：
 
         %{new_email}
     signup_after_approval:
-      title: "在审批之后注册"
-      subject_template: "您通过了%{site_name}的审核！"
+      title: "批准后注册"
+      subject_template: "您已被批准加入 %{site_name}！"
       text_body_template: |
-        欢迎来到%{site_name}！
+        欢迎来到 %{site_name}！
 
-        管理人员在%{site_name}上批准了您的账户。
+        管理人员批准了您在 %{site_name} 上的帐户。
 
-        您现在可以通过以下登录访问您的新账户：
+        您现在可以通过以下网址访问您的新帐户：
         %{base_url}
 
-        如果上述链接无法点击，请尝试将其复制并粘贴到浏览器的地址栏中。
+        如果无法点击以上链接，请尝试将其复制并粘贴到您的网络浏览器的地址栏中。
 
         %{new_user_tips}
 
         我们始终相信[文明社区行为](%{base_url}/guidelines)。
 
-        入住愉快！
+        好好享受您在社区的时光吧！
     signup_after_reject:
-      title: "拒绝后的注册"
-      subject_template: "您在 %{site_name}上被拒绝"
+      title: "拒绝后注册"
+      subject_template: "您加入 %{site_name} 的请求被拒绝"
       text_body_template: |
-        一名工作人员拒绝了您在 %{site_name} 上的帐户。
+        一名管理人员拒绝了您在 %{site_name} 上的帐户。
 
         %{reject_reason}
     signup:
       title: "注册"
-      subject_template: "[%{email_prefix}] 确认您的新账户"
+      subject_template: "[%{email_prefix}] 确认您的新帐户"
       text_body_template: |
         欢迎来到 %{site_name}！
 
-        点击下面链接确认并激活您的新账户：
+        点击下方链接确认并激活您的新帐户：
         %{base_url}/u/activate-account/%{email_token}
 
-        如果以上链接无法点击，请将它复制并粘贴到您的浏览器的地址栏。
+        如果无法点击以上链接，请尝试将其复制并粘贴到您的网络浏览器的地址栏中。
     activation_reminder:
       title: "激活提醒"
-      subject_template: "[%{email_prefix}]记得确认您的账户"
+      subject_template: "[%{email_prefix}] 记得确认您的帐户"
       text_body_template: |
         欢迎来到 %{site_name}！
 
-        这是一个提醒您激活账户的友情提醒。
+        旨在提醒您激活您的帐户。
 
-        请点击下面的链接来确认并激活您的新账户：
+        点击下方链接确认并激活您的新帐户：
         %{base_url}/u/activate-account/%{email_token}
 
-        如果上方的链接无法点击，请尝试将其复制并粘贴到浏览器的地址栏中。
+        如果无法点击以上链接，请尝试将其复制并粘贴到您的网络浏览器的地址栏中。
     suspicious_login:
-      title: "新登录警告"
-      subject_template: "[%{site_name}]新登录于%{location}"
+      title: "新登录提醒"
+      subject_template: "[%{site_name}] 来自%{location}的新登录"
       text_body_template: |
         您好，
 
-        我们注意到您从通常不使用的设备或位置登录。 这是您吗？
+        我们注意到从您不常用的设备或位置登录。这是您吗？
 
-         - 位置：%{location}(%{client_ip})
-         - 浏览器：%{browser}
-         - 设备：%{device} - %{os}
+         - 位置：%{location} (%{client_ip})
+         - 浏览器：%{browser}
+         - 设备：%{device} – %{os}
 
-        如果这是您，太棒了！您不需要做任何其他事情。
+        如果这是您，太好了！您无需执行任何操作。
 
-        如果不是您，请[查看您现有的会话](%{base_url}/my/preferences/account)并考虑更改密码。
+        如果不是您，请[查看您现有的会话](%{base_url}/my/preferences/account)并考虑更改您的密码。
     post_approved:
       title: "您的帖子已被批准"
       subject_template: "[%{site_name}] 您的帖子已被批准"
       text_body_template: |
-        您好：
+        您好，
 
-        这是来自 %{site_name} 的自动消息，[您的帖子] (%{base_url}%{post_url}) 已通过审核。
+        这是一封由 %{site_name} 自动发送的邮件，旨在通知[您的帖子](%{base_url}%{post_url})已被批准。
   page_forbidden:
-    title: "啊噢！该页面是私密的。"
-  site_setting_missing: "站点设定 `%{name}` 必须被设置。"
+    title: "糟糕！该页面是一个不公开页面。"
+  site_setting_missing: "必须设置 `%{name}` 站点设置。"
   page_not_found:
-    title: "抱歉！这个页面不存在或者是私密的。"
+    title: "糟糕！该页面不存在或者是一个不公开页面。"
     popular_topics: "热门"
     recent_topics: "最近"
     see_more: "更多"
-    search_title: "搜索该网页"
+    search_title: "搜索此站点"
     search_button: "搜索"
   offline:
-    title: "无法载入应用"
-    offline_page_message: "您似乎正处于离线状态！请检查网络连接并重试。"
+    title: "无法加载应用"
+    offline_page_message: "您好像离线了！请检查您的网络连接，然后重试。"
   login_required:
     welcome_message: |
-      ## [欢迎来到 %{title}](#welcome)
-      您需要一个账户。请创建一个账户或者登录以继续。
+      ## [欢迎来到%{title}](#welcome)
+      需要一个帐户。请创建帐户或登录以继续。
     welcome_message_invite_only: |
       ## [欢迎来到%{title}](#welcome)
-      您需要一个账号。请从现有用户处获取一个邀请或者登录。
+      需要一个帐户。请向现有成员请求邀请或登录以继续。
   deleted: "已删除"
   image: "图片"
   upload:
-    edit_reason: "下载外部图片留作副本"
-    unauthorized: "抱歉，您没有上传文件的权限（验证扩展：%{authorized_extensions}）。"
-    pasted_image_filename: "粘贴的图像"
-    store_failure: "用户#%{user_id} 上传的 #%{upload_id} 保存失败。"
-    file_missing: "抱歉，您必须选择一个文件上传。"
-    empty: "抱歉，但是您提交的文件是空的。"
-    png_to_jpg_conversion_failure_message: "从PNG转换为JPG时发生错误。"
-    optimize_failure_message: "优化上传的图像时出现了错误。"
+    edit_reason: "下载图片的本地副本"
+    unauthorized: "抱歉，您尝试上传的文件不被允许（允许的扩展名：%{authorized_extensions}）。"
+    pasted_image_filename: "粘贴图片"
+    store_failure: "无法保存用户 #%{user_id} 的上传 #%{upload_id}。"
+    file_missing: "抱歉，您必须提供要上传的文件。"
+    empty: "抱歉，您提供的文件是空的。"
+    png_to_jpg_conversion_failure_message: "从 PNG 转换为 JPG 时出错。"
+    optimize_failure_message: "优化上传的图片时出错。"
     attachments:
-      too_large: "抱歉，您试图上传的文件太大了（最大限制为%{max_size_kb}%KB）。"
+      too_large: "抱歉，您尝试上传的文件过大（最大大小为 %{max_size_kb}KB）。"
     images:
-      too_large: "抱歉，您试图上传的图片太大了（最大限制为%{max_size_kb}%KB），请裁剪它并重试。"
-      larger_than_x_megapixels: "对不起，您上传的图片太大(最大支持%{max_image_megapixels}像素)，请缩小图片然后再试一次。"
-      size_not_found: "抱歉，我们无法获取图片大小。也许是您的图片损坏了？"
+      too_large: "抱歉，您尝试上传的图片过大（最大大小为 %{max_size_kb}KB），请调整大小并重试。"
+      larger_than_x_megapixels: "抱歉，您尝试上传的图片过大（最大大小为 %{max_image_megapixels}00 万像素），请调整大小并重试。"
+      size_not_found: "抱歉，我们无法确定图片的大小。也许您的图片已被损坏？"
     placeholders:
-      too_large: "(图片大小超过%{max_size_kb}KB)"
+      too_large: "（图片大小超过 %{max_size_kb}KB）"
   avatar:
-    missing: "抱歉，我们没法找到与您邮件地址关联的头像。您能再上传一次试试吗？"
+    missing: "抱歉，我们找不到与该电子邮件地址关联的任何头像。您可以尝试重新上传吗？"
   flag_reason:
-    sockpuppet: "新用户创建了话题，而另一个新用户以同一个 IP 在该话题回复。查看站点设置的 <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a>。"
-    spam_hosts: "新用户尝试创建多个链接到相同域名的帖子。此用户所有包含链接的帖子需要审核。详见站点设置<a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>。"
+    sockpuppet: "一个新用户创建了一个话题，另一个位于相同 IP 地址 (%{ip_address}) 的新用户回复了。请参阅 <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a> 站点设置。"
+    spam_hosts: "此新用户试图创建多个帖子，其中包含指向同一网域的链接。应审核此用户发布的所有包含链接的帖子。请参阅 <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> 站点设置。"
   skipped_email_log:
-    exceeded_emails_limit: "超过max_emails_per_day_per_user"
-    exceeded_bounces_limit: "超过bounce_score_threshold"
-    mailing_list_no_echo_mode: "邮件列表通知已对用户自己的帖子禁用"
-    user_email_no_user: "不能找到ID为%{user_id}的用户"
-    user_email_post_not_found: "不能找到ID为%{post_id}的帖子"
+    exceeded_emails_limit: "超过 max_emails_per_day_per_user"
+    exceeded_bounces_limit: "超过 bounce_score_threshold"
+    mailing_list_no_echo_mode: "对用户自己的帖子禁用邮寄名单通知"
+    user_email_no_user: "找不到 ID 为 %{user_id} 的用户"
+    user_email_post_not_found: "找不到 ID 为 %{post_id} 的帖子"
     user_email_anonymous_user: "用户匿名"
-    user_email_user_suspended_not_pm: "用户被封禁，这不是私信"
-    user_email_seen_recently: "最近活跃用户"
-    user_email_notification_already_read: "此邮件的通知已被阅读"
-    user_email_notification_topic_nil: "post.topic为空"
+    user_email_user_suspended_not_pm: "用户被封禁，不是消息"
+    user_email_seen_recently: "用户最近有活动"
+    user_email_notification_already_read: "与此电子邮件有关的通知已被阅读"
+    user_email_notification_topic_nil: "post.topic 为零"
     user_email_post_user_deleted: "该帖子的用户已被删除。"
-    user_email_post_deleted: "话题被作者删除"
+    user_email_post_deleted: "帖子被作者删除"
     user_email_user_suspended: "用户被封禁"
-    user_email_already_read: "用户已阅读此帖"
-    user_email_access_denied: "用户不被允许查看此帖子"
-    user_email_no_email: "没有与用户id%{user_id}相关联的邮件"
-    sender_message_blank: "消息空"
-    sender_message_to_blank: "message.to为空"
-    sender_text_part_body_blank: "text_part.body为空"
-    sender_body_blank: "内容为空"
+    user_email_already_read: "用户已阅读此帖子"
+    user_email_access_denied: "不允许用户查看此帖子"
+    user_email_no_email: "没有与用户 ID %{user_id} 关联的电子邮件"
+    sender_message_blank: "消息为空"
+    sender_message_to_blank: "message.to 为空"
+    sender_text_part_body_blank: "text_part.body 为空"
+    sender_body_blank: "正文为空"
     sender_post_deleted: "帖子已被删除"
-    sender_message_to_invalid: "收件人电子邮箱地址无效"
+    sender_message_to_invalid: "收件人电子邮件地址无效"
     sender_topic_deleted: "话题已被删除"
+    group_smtp_post_deleted: "帖子已被删除"
+    group_smtp_topic_deleted: "话题已被删除"
+    group_smtp_disabled_for_group: "smtp 已对该群组禁用"
   color_schemes:
     base_theme_name: "基础"
     light: "浅色"
     dark: "深色"
-    neutral: "自然"
+    neutral: "中性"
     grey_amber: "灰琥珀色"
     shades_of_blue: "蓝黑"
     latte: "棕色"
@@ -3495,195 +3561,293 @@ zh_CN:
     wcag_dark: "WCAG 暗"
     wcag_dark_theme_name: "WCAG 暗"
     default_theme_name: "默认"
-    light_theme_name: "亮"
-    dark_theme_name: "暗"
-    neutral_theme_name: "平淡"
+    light_theme_name: "浅色"
+    dark_theme_name: "深色"
+    neutral_theme_name: "中性"
     grey_amber_theme_name: "灰琥珀色"
     shades_of_blue_theme_name: "蓝黑"
     latte_theme_name: "棕色"
     summer_theme_name: "夏季"
     dark_rose_theme_name: "黑红"
-  edit_this_page: "编辑页面"
+  edit_this_page: "编辑此页面"
   csv_export:
     boolean_yes: "是"
     boolean_no: "否"
-    rate_limit_error: "帖子只能每天下载一次，请明天再重试。"
+    rate_limit_error: "帖子每天只能下载一次，请明天再试。"
   static_topic_first_reply: |
-    编辑本话题的第一帖以改变 %{page_name} 页面的内容。
+    编辑此话题中的第一个帖子以更改 %{page_name} 页面的内容。
   guidelines_topic:
-    title: "FAQ/指引"
+    title: "常见问题解答/准则"
+    body: |
+      <a name="civilized"></a>
+
+      ## [这是一个提倡文明讨论的地方](#civilized)
+
+      在论坛上请表现得像在公园一样得体。我们一群人共享一个公共社区资源 &mdash; 一个通过不断讨论来分享我们的技能、知识和兴趣的地方。
+
+      这些不是死规矩或者草率决定。这些准则旨在帮助社区的人进行判断，并将社区打造成一个友善、友好的场所，推动文明公开讨论。
+
+      <a name="improve"></a>
+
+      ## [改善讨论](#improve)
+
+      帮助我们让这个地方变成一个讨论的好地方，始终在讨论中加入一些积极的内容，无论多小都可以。如果您不确定您的帖子是否有益于对话，那就认真想一想您要说什么再发布。
+
+      改善讨论的一种方法是发现已经发生过的事。在回复或开始您自己的话题前，请花一些时间浏览话题，这样您更有机会遇见和您有共同爱好的人。
+
+      这里讨论的话题对我们很重要，并且我们希望您也觉得这些内容对您很重要。尊重这些话题以及讨论它们的人，特别是当您不同意他们的观点时。
+
+      <a name="agreeable"></a>
+
+      ## [即使您不同意他人，也请尊重他人](#agreeable)
+
+      您可能想表达您有不同意见。这没问题。但是，记住_批评观点，而不是人_。请避免：
+
+      * 指名道姓
+      * 人身攻击
+      * 回复帖子的语气而不是其实际内容
+      * 下意识的反驳
+
+      相反，请提供有助于改善讨论的合理观点。
+
+      <a name="participate"></a>
+
+      ## [您的参与有意义](#participate)
+
+      我们在这里的讨论将为每个新成员树立榜样。通过选择参与有意义的讨论，帮助我们将论坛变成一个有意思的地方，并避免那些没有帮助的行为，为社区创造一个美好的未来。
+
+      Discourse 提供了让社区共同鉴别最棒（或最差）贡献的工具：书签、赞、举报、回复、编辑、关注、免打扰等。利用这些工具来改善您自己以及其他所有人的体验。
+
+      让我们创造一个更美好的社区。
+
+      <a name="flag-problems"></a>
+
+      ## [如果您发现问题，请举报](#flag-problems)
+
+      版主有特别的权力；他们对论坛负责。但您也是。有了您的帮助，版主可以成为社区引导者，而不仅仅是守卫或者警察。
+
+      当您看到不良行为时，不要回复。这种承认会变相鼓励这种不良行为，既消耗您的精力，又浪费每一个人的时间。_只需举报它_。如果收到足够多的举报，将会有相应的处理，这种处理可能会自动发生，也可能由版主介入。
+
+      为了维护我们的社区，版主保留随时以任何理由删除任何内容和任何用户帐户的权利。版主不会预先审核任何新帖子；版主和站点维护人员对社区发表的任何言论均不负责任。
+
+      <a name="be-civil"></a>
+
+      ## [永远保持文明](#be-civil)
+
+      粗鲁这样的行为会破坏健康的讨论：
+
+      * 文明。不要发表任何理智的人会认为冒犯、过分或招致怨恨的言论。
+      * 拒绝色情。不要发表任何淫秽或性暗示的内容。
+      * 尊重彼此。不要骚扰或者让别人难过，冒充他人，或暴露他们的个人信息。
+      * 尊重我们的论坛。不要发表垃圾信息或以其他方式破坏论坛。
+
+      这些条款不是法律条文，并且没有准确的定义 &mdash; 避免_出现_任何这些内容。如果您不确定，问问当自己的帖子出现在主流新闻网站的头条时，您会有什么感觉。
+
+      这是一个公共论坛，并且搜索引擎会将这些讨论编入索引。注意发表的语言、链接和图片，不要在其中包含您的家人和朋友。
+
+      <a name="keep-tidy"></a>
+
+      ## [保持整洁](#keep-tidy)
+
+      花一点时间让东西出现在正确的位置，这样我们可以将更多的时间花在讨论而非清理上。所以：
+
+      * 不要在错误的类别发表新话题；请阅读类别定义。
+      * 不要在多个话题中回复同样的内容。
+      * 不要发布没有内容的回复。
+      * 不要在中途改变话题。
+      * 不要在您的帖子中签名 &mdash; 每一个帖子都附有您的个人信息。
+
+      比起发表“+1”或者“同意”，请使用“赞”按钮。比起将现有话题带向一个截然不同的方向，使用“作为链接话题回复”。
+
+      <a name="stealing"></a>
+
+      ## [只发表您自己的东西](#stealing)
+
+      未经许可，您不能发表属于他人的任何数字资产。您不能发表会窃取他人知识产权（软件、视频、音频和图片）或违反任何其他法律的简介、链接或方法。
+
+      <a name="power"></a>
+
+      ## [由您推动](#power)
+
+      此站点由[友善的管理人员](%{base_path}/about)、*您*和社区一起运营。如果您对这里的工作方式有任何进一步的问题，请在[站点反馈类别](%{base_path}/c/site-feedback)新建一个话题并开始讨论！如果遇到了重要或紧急的事情，并且不能通过话题或举报解决，请通过[管理人员页面](%{base_path}/about)联系我们。
+
+      <a name="tos"></a>
+
+      ## [服务条款](#tos)
+
+      是的，法律术语很无聊，但是我们必须保护自己，进而保护您和您的数据免受不友好的人带来的伤害。我们提供了[服务条款](%{base_path}/tos)来描述您（和我们）关于内容、隐私和法律的行为和权利。要使用此服务，您必须同意遵守我们的[服务条款](%{base_path}/tos)。
   tos_topic:
     title: "服务条款"
     body: |
-      这些条款用于管理<%{base_url}>上互联网论坛的使用。要使用论坛，您必须与运行论坛的公司%{company_name}达成这些条款。
+      这些条款用于管理 <%{base_url}> 上互联网论坛的使用。要使用论坛，您必须与运行论坛的公司 %{company_name} 达成这些条款。
 
       公司可能会根据不同条款提供其他产品和服务。这些条款仅适用于论坛的使用。
 
       跳到：
 
-       - [重要条款](#heading--重要条款)
-       - [您使用论坛的许可](#heading--permission)
-       - [论坛的使用条件](#heading--conditions)
-       - [可接受的用途](#heading--可接受使用)
+       - [重要条款](#heading--important-terms)
+       - [您使用论坛的权限](#heading--permission)
+       - [使用论坛的条件](#heading--conditions)
+       - [可接受的使用](#heading--acceptable-use)
        - [内容标准](#heading--content-standards)
-       - [执法](#heading--强制执行)
-       - [您的账户](#heading--您的账户)
-       - [您的内容](#heading--您的内容)
+       - [执行](#heading--enforcement)
+       - [您的帐户](#heading--your-account)
+       - [您的内容](#heading--your-content)
        - [您的责任](#heading--责任)
-       - [免责声明](#heading--免责声明)
-       - [责任限额](#heading--liability)
+       - [免责声明](#heading--responsibility)
+       - [责任限制](#heading--liability)
        - [反馈](#heading--feedback)
-       - [终止](#heading--终止)
+       - [终止](#heading--termination)
        - [争议](#heading--dispute)
        - [一般条款](#heading--general)
-       - [联系方式](#heading--contact)
-       - [更改](#heading--更改)
+       - [联系](#heading--contact)
+       - [变更](#heading--changes)
 
-      <h2 id =“heading--important-terms”><a href="#heading--important-terms">重要条款</a></h2>
+      <h2 id="heading--important-terms"><a href="#heading--important-terms">重要条款</a></h2>
 
-      ***这些条款包括一些影响您的权利和责任的重要条款，例如[免责声明](#heading-disclaimers)中的免责声明，对[责任限制](#heading--liability)中公司对您的责任的限制，您同意在[责任使用](#heading-responsibility)中滥用论坛所造成的损害赔偿公司，以及在[争议](#heading--disputes)中仲裁争议的协议***
+      ***这些条款包括一些影响您的权利和责任的重要条款，例如[免责声明](#heading-disclaimers)中的免责声明，[责任限制](#heading--liability)中公司对您的责任的限制，[使用责任](#heading-responsibility)中您同意对因滥用论坛而造成的损害赔偿公司，以及[争议](#heading--disputes)中仲裁争议的协议***。
 
-      <h2 id =“heading--permission”><a href="#heading--permission">您使用论坛的权限</a></h2>
+      <h2 id="heading--permission"><a href="#heading--permission">您使用论坛的权限</a></h2>
 
-      在遵守这些条款的前提下，公司允许您使用论坛。每个人都需要同意这些条款才能使用论坛。
+      在遵守这些条款的前提下，公司授予您使用论坛的权限。每个人都需要同意这些条款才能使用论坛。
 
-      <h2 id =“heading--conditions”><a href="#heading--conditions">论坛使用条件</a></h2>
+      <h2 id="heading--conditions"><a href="#heading--conditions">使用论坛的条件</a></h2>
 
-      您使用论坛的许可受以下条件限制：
+      您使用论坛的权限受以下条件限制：
 
-      1.您必须至少十三岁。
+      1. 您必须至少十三岁。
 
-      2.如果公司直接与您表示不能，您不能继续使用该论坛。
+      2. 如果公司直接向您表示不能，您将无法继续使用论坛。
 
-      3.您必须按照[可接受使用](#heading--accepted-use)和[内容标准](#heading--content-standards)使用论坛。
+      3. 您必须按照[可接受的使用](#heading--accepted-use)和[内容标准](#heading--content-standards)使用论坛。
 
-      <h2 id =“heading--acceptable-use”><a href="#heading--acceptable-use">可接受的使用</a></h2>
+      <h2 id="heading--acceptable-use"><a href="#heading--acceptable-use">可接受的使用</a></h2>
 
-      1.您不能使用论坛违法。
+      1. 使用论坛时，您不能违法。
 
-      2.未经特别许可，您不得在论坛上使用或尝试使用他人的账户。
+      2. 未经特别许可，您不能在论坛上使用或尝试使用他人的帐户。
 
-      3.您不得在论坛上购买，出售或以其他方式交易用户名或其他唯一标识符。
+      3. 您不得在论坛上购买、出售或以其他方式交易用户名或其他唯一标识符。
 
-      4.您不得通过论坛发送广告，连锁信或其他请求，或使用论坛收集商业邮件列表或数据库的地址或其他个人数据。
+      4. 您不得通过论坛发送广告、连锁信或其他请求，或使用论坛为商业邮寄名单或数据库收集地址或其他个人数据。
 
-      5.您不能使用程序自动访问论坛或监控论坛，例如使用网络爬虫，浏览器插件或插件，或其他非Web浏览器的计算机程序。如果您运行一个搜索引擎，您可以抓取论坛为其公开搜索引擎编制索引。
+      5. 您不得使用程序自动访问论坛或监控论坛，例如使用网络抓取工具、浏览器插件或插件，或其他非网络浏览器的计算机程序。如果您运行搜索引擎，您可以抓取论坛，为公开搜索引擎编制索引。
 
-      6.您不能使用论坛将邮件发送到通讯组列表，新闻组或组邮件别名。
+      6. 您不得使用论坛将电子邮件发送到分发列表、新闻组或群组邮件别名。
 
-      7.您不得虚假暗示您与本公司有关联或得到许可。
+      7. 您不得虚假暗示您与本公司有关联或得到许可。
 
-      8.您不得在其他论坛上超链接到本论坛的图片或其他非超文本内容。
+      8. 您不得在其他网页上超链接到论坛上的图片或其他非超文本内容。
 
-      9.您不得从论坛下载的资料中删除任何显示所有权的标记。
+      9. 您不得在从论坛下载的资料中移除任何显示专有所有权的标记。
 
-      10.您可能无法使用`<iframe>`在其他网站上显示论坛的任何部分。
+      10. 您不得使用 `<iframe>` 在其他网站上显示论坛的任何部分。
 
-      11.您不得禁用，避免或绕过论坛的任何安全或访问限制。
+      11. 您不得禁用、避免或绕过论坛的任何安全或访问限制。
 
-      12.您不能对论坛的基础设施施加不合理的请求量，或者旨在对论坛底层信息系统施加不合理负担的请求。
+      12. 您不得对论坛的基础架构施加不合理的请求量，或者发起旨在对论坛底层信息系统施加不合理负担的请求。
 
-      13.您不得通过论坛冒充他人。
+      13. 您不得通过论坛冒充他人。
 
-      14.您不得鼓励或帮助违反这些条款的任何人。
+      14. 您不得鼓励或帮助违反这些条款的任何人。
 
-      <h2 id =“heading--content-standards”><a href="#heading--content-standards">内容标准</a></h2>
+      <h2 id="heading--content-standards"><a href="#heading--content-standards">内容标准</a></h2>
 
-      1.您不得向论坛提交非法，冒犯或以其他方式伤害他人的内容。这包括骚扰，不恰当或滥用的内容。
+      1. 您不得向论坛提交非法、冒犯或以其他方式伤害他人的内容。包括骚扰、不恰当或滥用的内容。
 
-      2.您不得向论坛提交违反法律，侵犯任何人的知识产权，侵犯任何人隐私或违反与他人协议的内容。
+      2. 您不得向论坛提交违反法律，侵犯任何人的知识产权，侵犯任何人隐私或违反与他人协议的内容。
 
-      3.您不得向包含恶意计算机代码的论坛提交内容，例如计算机病毒或间谍软件。
+      3. 您不得向论坛提交包含恶意计算机代码的内容，例如计算机病毒或间谍软件。
 
-      4.您不得将内容作为占位符提交给论坛，以保存特定地址，用户名或其他唯一标识符。
+      4. 您不得将内容作为占位符提交给论坛，以占用特定地址、用户名或其他唯一标识符。
 
-      5.您不得使用论坛披露您无权披露的信息，例如他人的机密或个人信息。
+      5. 您不得使用论坛披露您无权披露的信息，例如他人的机密或个人信息。
 
-      <h2 id =“heading--enforcement”><a href="#heading--enforcement">执法</a></h2>
+      <h2 id="heading--enforcement"><a href="#heading--enforcement">执行</a></h2>
 
-      公司可以在最大程度上调查和起诉违反这些条款的行为。公司可以通知执法机关并与其合作起诉违法行为和这些条款。
+      公司可以在最大程度上调查和起诉违反这些条款的行为。公司可能通知执法机关并与其合作起诉违反法律和这些条款的行为。
 
-      公司保留以任何理由更改，编辑和删除论坛内容的权利。如果您认为有人违反这些条款向论坛提交了内容，请[立即与我们联系](#heading--contact)。
+      公司保留以任何原因更改、编辑和删除论坛内容的权利。如果您认为有人向论坛提交了违反这些条款的内容，请[立即与我们联系](#heading--contact)。
 
-      <h2 id =“heading--your-account”><a href="#heading--your-account">您的账户</a></h2>
+      <h2 id="heading--your-account"><a href="#heading--your-account">您的帐户</a></h2>
 
-      您必须创建并登录账户才能使用论坛的某些功能。
+      您必须创建并登录帐户才能使用论坛的某些功能。
 
-      要创建账户，您必须提供有关您自己的一些信息。如果您创建了一个账户，则表示您同意至少提供有效的邮件地址，并使该地址保持最新状态。您可以随时通过邮件<%{contact_email}>关闭您的账户。
+      要创建帐户，您必须提供有关您自己的一些信息。如果您创建帐户，则表示您同意至少提供有效的电子邮件地址，并使该地址保持最新状态。您可以随时通过发送电子邮件到 <%{contact_email}> 关闭您的帐户。
 
-      您同意对使用您的账户账户采取的所有操作负责，无论您是否授权，直到您关闭账户或通知公司您的账户已遭到入侵。如果您怀疑自己的账户遭到入侵，则表示您同意立即通知公司。您同意为您的账户选择安全密码，并保密。
+      您同意对使用您的帐户采取的所有操作负责，无论您是否授权，直到您关闭帐户或通知公司您的帐户已遭到入侵。如果您怀疑自己的帐户遭到入侵，您同意立即通知公司。您同意为您的帐户选择安全密码，并保密。
 
-      公司可以根据其处理与版权相关的删除请求的政策限制，暂停或关闭您在论坛上的账户，或者如果公司合理地认为您违反了这些条款中的任何规则。
+      公司可能根据处理与版权相关的删除请求的政策，或者如果公司合理地认为您违反了这些条款中的任何规则，限制、暂停或关闭您在论坛上的帐户。
 
-      <h2 id =“heading--your-content”><a href="#heading--your-content">您的内容</a></h2>
+      <h2 id="heading--your-content"><a href="#heading--your-content">您的内容</a></h2>
 
-      这些条款中的任何内容均未赋予公司您与论坛共享的知识产权的所有权，例如您提交给论坛的账户信息，帖子或其他内容。这些条款中的任何内容都不会赋予您对公司知识产权的任何所有权。
+      这些条款中的任何内容均未赋予公司您与论坛共享的知识产权（例如您的帐户信息、帖子或提交给论坛的其他内容）的任何所有权。这些条款中的任何内容都不赋予您对公司知识产权的任何所有权。
 
-      在您和公司之间，您仍然对您提交给论坛的内容负全部责任。您同意不会错误地暗示您提交给论坛的内容是由公司赞助或批准的。根据这些条款，这些条款并不要求公司存储，维护或提供您提交的内容的副本，并对其进行更改。
+      在您和公司之间，您仍然对您提交给论坛的内容负全部责任。您同意不会错误地暗示您提交给论坛的内容是由公司赞助或批准的。这些条款并不要求公司存储、维护或提供您提交的内容的副本，并对其进行更改。
 
-      您提交给论坛的内容属于您，您决定授予其他人的权限。但至少，您授权该公司向论坛的其他用户提供您提交给论坛的内容。该特殊许可允许公司复制，发布和分析您提交给论坛的内容。
+      您提交给论坛的内容属于您，您决定授予其他人的权限。但至少，您授权公司向论坛的其他用户提供您提交给论坛的内容。该特殊许可允许公司复制、发布和分析您提交给论坛的内容。
 
-      当您提交的内容从论坛中删除时，无论是您还是公司，当最后一个副本从公司的备份，缓存和其他系统中消失时，公司的特殊许可将终止。您提交的内容的其他许可，例如[Creative Commons](https://creativecommons.org)许可，可能会在您的内容被删除后继续。这些许可可能会让其他人或公司本身再次通过论坛分享您的内容。
+      当您提交的内容被从论坛中移除时，无论是您还是公司移除，当最后一个副本从公司的备份、缓存和其他系统中消失时，公司的特殊许可将终止。您提交的内容的其他许可，例如 [Creative Commons](https://creativecommons.org) 许可，可能会在您的内容被移除后继续。这些许可可能会让其他人或本公司再次通过论坛分享您的内容。
 
-      收到您提交给论坛的内容的其他人可能违反了您对内容进行许可的条款。您同意公司不会对这些违规行为或其后果承担责任。
+      收到您提交给论坛的内容的其他人可能违反您对内容进行许可的条款。您同意公司不会对这些违规行为或其后果承担责任。
 
-      <h2 id =“heading-responsibility”><a href="#heading--responsibility">您的责任</a></h2>
+      <h2 id="heading--responsibility"><a href="#heading--responsibility">您的责任</a></h2>
 
-      您同意赔偿公司因与您违反这些条款有关的其他人的法律索赔，或其他人在论坛上使用您的账户违反这些条款。您和公司都同意尽快通知另一方您可能需要赔偿公司的任何法律索赔。如果公司未能及时通知您合法索赔，您将无需赔偿公司因您可能在及时通知后进行辩护或减轻的损失。您同意允许公司控制您必须赔偿公司的法律索赔的调查，辩护和解决，并与这些努力合作。未经您事先同意，公司同意不同意任何承认错误或对您施加义务的和解。
+      您同意就其他人因您违反这些条款或他们因使用您在论坛上的帐户而违反这些条款而提出的法律索赔赔偿公司。您和公司都同意将您可能需要赔偿公司的任何法律索赔通知对方。如果公司未能及时将法律索赔通知您，您无需就您本可以通过及时通知进行抗辩或减轻的损害赔偿公司。您同意允许公司控制您必须赔偿公司的法律索赔的调查、辩护和解决，并配合这些努力。未经您事先同意，公司同意不会同意任何承认您有过错或对您强加义务的和解。
 
-      <h2 id =“heading--disclaimers”><a href="#heading--disclaimers">免责声明</a></h2>
+      <h2 id="heading--disclaimers"><a href="#heading--disclaimers">免责声明</a></h2>
 
       ***您接受在论坛上使用论坛和内容的所有风险。在法律允许的范围内，公司及其供应商按原样提供论坛，不作任何保证。***
 
-      论坛可以超链接并集成其他人运行的论坛和服务。公司不对其他人提供的服务或他们提供的内容提供任何保证。其他人运行的服务的使用可能受您与正在运行的服务之间的其他条款的约束。
+      论坛可以超链接并集成其他人运行的论坛和服务。公司不对其他人提供的服务或他们提供的内容提供任何保证。其他人运行的服务的使用可能受您与运行服务的相关方之间的其他条款的约束。
 
-      <h2 id =“heading--liability”><a href="#heading--liability">责任限制</a></h2>
+      <h2 id="heading--liability"><a href="#heading--liability">责任限制</a></h2>
 
-      ***当您同意这些条款时，公司及其供应商均不对您的人员无法合理预见的违反合同的损害承担责任。***
+      ***当您同意这些条款时，公司及其供应商均不因他们的人员无法合理预见的违反合同的损害对您承担责任。***
 
-      ***在法律允许的范围内，与论坛或论坛内容相关的任何类型的索赔的全部责任将限制在50美元。***
+      ***在法律允许的范围内，与论坛或论坛内容相关的任何类型的索赔的全部责任将被限制为 50 美元。***
 
-      <h2 id =“heading--feedback”><a href="#heading--feedback">反馈</a></h2>
+      <h2 id="heading--feedback"><a href="#heading--feedback">反馈</a></h2>
 
-      公司欢迎您对论坛的反馈和建议。请参阅下面的[联系方式](#heading--contact)部分，了解与我们取得联系的方式。
+      公司欢迎您对论坛的反馈和建议。请参阅下面的[联系](#heading--contact)部分，了解与我们取得联系的方式。
 
-      您同意公司可以根据您提供的反馈和建议自由行事，并且公司不必通知您您的反馈已被使用，获得您的使用许可或付款给您。您同意不向您或他人提交您认为可能是机密或专有的反馈或建议。
+      您同意公司可以根据您提供的反馈和建议自由行事，并且公司不必通知您的反馈已被使用，获得您的使用许可或付款给您。您同意不向您或他人提交您认为可能是机密或专有内容的反馈或建议。
 
-      <h2 id =“heading--termination”><a href="#heading--termination">终止</a></h2>
+      <h2 id="heading--termination"><a href="#heading--termination">终止</a></h2>
 
-      您或公司可以随时终止以这些条款书写的协议。当我们的协议结束时，您对论坛的许可也将终止。
+      您或公司可以随时终止以这些条款书写的协议。当我们的协议结束时，您使用论坛的权限也将终止。
 
-      以下条款在我们的协议结束后继续有效：[您的内容](#heading--your-content)，[反馈](#heading--feedback)，[您的责任](#heading--responsibility)，[免责声明](#heading--disclaimers)，[责任限制](#heading--liability)和[General Terms](#heading--general)。
+      以下条款在我们的协议结束后继续有效：[您的内容](#heading--your-content)、[反馈](#heading--feedback)、[您的责任](#heading--responsibility)、[免责声明](#heading--disclaimers)、[责任限制](#heading--liability)和[一般条款](#heading--general)。
 
-      <h2 id =“heading--dispute”><a href="#heading--disputes"> Disputes </a></h2>
+      <h2 id="heading--disputes"><a href="#heading--disputes">争议</a></h2>
 
       %{governing_law}将管辖与这些条款或您对论坛的使用相关的任何争议。
 
-      您和公司同意仅在%{city_for_disputes}的州或联邦法院寻求与这些条款相关的禁令。您和公司都不会反对这些法院的管辖权，论坛或地点。
+      您和公司同意仅在%{city_for_disputes}的州或联邦法院寻求与这些条款相关的禁令。您和公司都不会反对这些法院的管辖权、法庭或地点。
 
-      ***除了寻求禁令或根据“计算机欺诈和滥用法案”提出的索赔外，您和公司将通过约束美国仲裁协会的仲裁来解决任何争议。仲裁将遵循AAA的商业仲裁规则和消费者相关争议的补充程序。仲裁将在 %{city_for_disputes}举行。您将作为个人解决任何争议，而不是作为集体诉讼或其他代表诉讼的一部分，无论是作为原告还是集体成员。未经公司许可，任何仲裁员均不得将任何争议与任何其他仲裁合并。***
+      ***除了寻求禁令或根据《计算机欺诈和滥用法案》提出的索赔外，您和公司将通过具有约束力的美国仲裁协会仲裁来解决任何争议。仲裁将遵循 AAA 的商业仲裁规则和消费者相关争议的补充程序。仲裁将在%{city_for_disputes}举行。您将作为个人解决任何争议，而不是作为集体诉讼或其他代表诉讼的一部分，无论是作为原告还是集体成员。未经公司许可，任何仲裁员均不得将任何争议与任何其他仲裁合并。***
 
-      任何仲裁裁决将包括仲裁费用，合理的律师费和证人的合理费用。您和公司可以在任何有管辖权的法院进行仲裁裁决。
+      任何仲裁裁决将包括仲裁费用、合理的律师费和证人的合理费用。您和公司可以在任何有管辖权的法院进行仲裁裁决。
 
-      <h2 id =“heading--general”><a href="#heading--general">一般条款</a></h2>
+      <h2 id="heading--general"><a href="#heading--general">一般条款</a></h2>
 
-      如果这些条款的规定在书面上无法执行，但可以更改为可强制执行，则应将该条款修改为使其可执行所必需的最小程度。否则，应删除该条款。
+      如果这些条款的规定在书面上无法执行，但可以更改为可强制执行，则应将该条款修改为使其可执行所必需的最小程度。否则，应移除该条款。
 
-      您不得与公司分配您的协议。公司可以将您的协议转让给公司的任何关联公司，获得公司控制权的任何其他公司，或购买与公司相关的公司资产的任何其他公司。任何针对这些条款的尝试转让都没有法律效力。
+      您不得与公司转让您的协议。公司可以将您的协议转让给公司的任何关联公司、获得公司控制权的任何其他公司或购买与论坛相关的公司资产的任何其他公司。任何针对这些条款的尝试转让都没有法律效力。
 
-      无论是否行使本协议下的任何权利，或放弃任何违反本协议的行为，均不得放弃任何其他违反本协议的行为。
+      行使本协议项下的任何权利，或放弃任何违反本协议的行为，均不放弃任何其他违反本协议的行为。
 
-      这些条款体现了您和公司之间关于论坛使用的所有协议条款。这些条款完全取代了有关您使用论坛的任何其他协议，无论是否编写。
+      这些条款体现了您和公司之间关于论坛使用的所有协议条款。这些条款完全取代有关您使用论坛的任何其他协议，无论是否编写。
 
-      <h2 id =“heading--contact”><a href="#heading--contact">联络</a></h2>
+      <h2 id="heading--contact"><a href="#heading--contact">联系</a></h2>
 
-      您可以根据这些条款通知公司，并通过<%{contact_email}>向公司发送问题。
+      您可以根据这些条款通知公司，并发送电子邮件到 <%{contact_email}> 向公司发送问题。
 
-      公司可以使用您在论坛上为您的账户提供的邮件地址，或通过向论坛的主页或您的账户页面发布消息，根据这些条款通知您。
+      公司可以使用您在论坛上为您的帐户提供的电子邮件地址，或者通过向论坛的首页或您的帐户页面发布消息，根据这些条款通知您。
 
-      <h2 id =“heading--changes”><a href="#heading--changes">更改</a></h2>
+      <h2 id="heading--changes"><a href="#heading--changes">变更</a></h2>
 
-      该公司最后更新了这些条款于2018年7月12日，并可能再次更新这些条款。该公司将发布所有更新到论坛。对于包含重大更改的更新，如果您已创建账户并提供有效的邮件地址，则公司同意通过邮件通知您。该公司还可以在论坛上通过特殊消息或警报宣布更新。
+      公司最后更新这些条款的日期为 2018 年 7 月 12 日，并可能再次更新这些条款。公司会将所有更新发布到论坛。对于包含重大变更的更新，如果您已创建帐户并提供有效的电子邮件地址，公司同意通过电子邮件通知您。公司还会在论坛上通过特殊消息或警报宣布更新。
 
       一旦您收到这些条款的更新通知，您必须同意新条款才能继续使用论坛。
   privacy_topic:
@@ -3693,458 +3857,460 @@ zh_CN:
 
       ## [我们收集什么信息？](#collect)
 
-      我们从您在我们站点注册开始从您那开始收集信息，并收集关于您在论坛的阅读和写作的数据，并评估分享的内容。
+      当您在我们的站点注册时，我们会从您那里收集信息，并在您通过阅读、编辑和评估分享的内容参与论坛时收集数据。
 
-      当在我们站点注册时，您可能被要求输入您的名字和邮件地址。然而您可以在不用注册的情况下访问站点。您的邮件地将通过一个独一无二的链接验证。如果链接被访问了，我们就知道您控制了该邮件地址。
+      在我们的站点上注册时，您可能会被要求输入您的姓名和电子邮件地址 但是，您可以在不注册的情况下访问我们的网站。您的电子邮件地址将通过包含唯一链接的电子邮件进行验证。如果该链接被访问，我们就知道您控制着该电子邮件地址。
 
-      当已注册和发帖时，我们记录发布帖子时的 IP 地址。我们也可能保留服务器日志，其中包括了每一个向我们服务器的请求。
+      注册和发帖时，我们会记录发布帖子时的 IP 地址。我们也可能保留服务器日志，其中包括向我们的服务器发送的每一个请求。
 
       <a name="use"></a>
 
       ## [我们如何使用您的信息？](#use)
 
-      从您那收集的任何数据将以以下方式使用：
+      我们从您那里收集的任何信息可能通过以下方式之一使用：
 
-      * 改进您的个人体验 &mdash; 您的信息帮助我们更好地满足您的个人需求。
-      * 改进我们的站点 &mdash; 我们基于信息和我们从您那收到的反馈不断地试图改进我们的站点。
-      * 改善我们的客户服务 &mdash; 您的信息帮助我们更有效地回应用户服务请求和支持。
-      * 用于发送阶段性的邮件 &mdash; 您提供的邮件地址可能用于接受信息、您想看到的通知或与您用户名有关的回复和询问，或是其他的请求和问题。
+      * 个性化您的个人体验 - 您的信息将帮助我们更好地满足您的个人需求。
+      * 改进我们的站点 - 我们基于从您那里收到的信息和反馈不断改进我们的站点。
+      * 改善我们的客户服务 - 您的信息将帮助我们更有效地响应客户服务请求和支持需求。
+      * 发送定期电子邮件 - 您提供的电子邮件地址可用于向您发送信息、您请求的有关话题更改的通知，响应您的用户名，回复查询和/或其他请求或问题。
 
       <a name="protect"></a>
 
-      ## [我们如何保护您的信息?](#protect)
+      ## [我们如何保护您的信息？](#protect)
 
-      我们实现了一系列的安全措施保证您输入、提交或者访问您个人信息的数据安全。
+      我们实现了一系列安全措施，在您输入、提交或者访问您个人信息时保障您的个人信息的安全。
 
       <a name="data-retention"></a>
 
-      ## [数据保存政策是什么？](#data-retention)
+      ## [数据保留政策是什么？](#data-retention)
 
-      我们将善意地：
+      我们会善意地：
 
-      * 保存 90 天内的所有向服务器的包含 IP 地址的请求。
-      * 保存 5 年内已注册用户和与他们的帖子有关的 IP 地址。
+      * 将包含对此服务器的所有请求的 IP 地址的服务器日志保留不超过 90 天。
+      * 将与注册用户及其帖子相关联的 IP 地址保留不超过 5 年。
 
       <a name="cookies"></a>
 
       ## [我们使用 Cookie 吗？](#cookies)
 
-      是的。Cookie 是网站或它的服务商通过网页浏览器存储在您电脑硬盘上的小文件（如果您同意）。这些 Cookie 使站点能分辨您的浏览器，并且，如果您注册了一个账户，与您的注册账户关联。
+      是的。Cookie 是站点或其服务提供商通过网络浏览器存储在您计算机硬盘上的小文件（如果您同意）。这些 Cookie 使站点可以识别您的浏览器，并且如果您注册了帐户，将其与您的注册帐户关联。
 
-      我们使用 Cookie 为之后的访问和编译一小段关于站点流量和交互的数据来判断并保存您的个人设置，这样我们可以在之后提供更好的站点体验和工具。我们可能使用第三方服务商来帮助我们更好地理解我们的站点访客。这些服务商是不允许代表我们使用收集的信息，除非是在帮助我们执行和改进我们的站点。
+      我们使用 Cookie 来了解和保存您对未来访问的偏好，并编译有关站点流量和站点互动的汇总数据，以便我们在未来提供更好的站点体验和工具。我们可能使用服务提供商来帮助我们更好地理解我们的站点访客。这些服务提供商不会被允许代表我们使用收集的信息，除非可以帮助我们开展和改进我们的业务。
 
       <a name="disclose"></a>
 
-      ## [我们会在站外提供任何信息吗？](#disclose)
+      ## [我们是否将任何信息透露给外界？](#disclose)
 
-      我们绝不销售、教育或任何向外转移您个人信息的行为。这不包括帮助我们管理站点、改进站定或给您提供服务的第三方团体，这些团体需要保证对这些信息保密。当我们认为提交您的信息符合法律、我们的站点政策或保护我们或其他人的权利、知识产权或安全时，我们也可能提交您的信息。然而，非个人访问信息可能供其他团体使用，用于市场、广告或其他用途。
+      我们不会出售、交易或以其他方式将您的个人身份信息转让给外界。这不包括协助我们运营我们的站点、开展我们的业务或为您提供服务的受信任第三方，前提是这些第三方同意对这些信息保密。当我们认为发布您的信息是为了遵守法律、执行我们的网站政策或保护我们或其他人的权利、财产或安全时，我们也可能会发布您的信息。但是，我们可能会将非个人身份访问者信息提供给其他方用于营销、广告或其他用途。
 
       <a name="third-party"></a>
 
       ## [第三方链接](#third-party)
 
-      偶尔地，根据我们的判断，我们可能在我们的站点上包括或提供第三方团体的产品或服务。这些第三方站点用于独立和不同的隐私政策。因此我们对链接到的站点或活动没有责任和权利。尽管如此，我们寻求保护我们的整个站点冰鞋欢迎您给这些站点反馈。
+      有时，根据我们的判断，我们可能会在我们的网站上包含或提供第三方产品或服务。这些第三方网站有单独和独立的隐私政策。因此，我们对这些链接网站的内容和活动不承担任何责任或义务。尽管如此，我们仍力求保护我们网站的完整性，并欢迎对这些网站的任何反馈。
 
       <a name="coppa"></a>
 
       ## [儿童在线隐私保护法案合规](#coppa)
 
-      我们的站点、产品和服务提供给 13 岁以上的人们。如果服务器位于美国，并且您小于 13 岁，根据[儿童在线隐私保护法案合规](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)，不要使用这个站点。
+      我们的网站、产品和服务均面向年满 13 岁或以上的人。如果此服务器在美国，并且您未满 13 岁，则根据 COPPA（[儿童在线隐私保护法案](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)）要求，请勿使用本网站。
 
       <a name="online"></a>
 
-      ## [仅用于在线隐私政策](#online)
+      ## [仅在线隐私政策](#online)
 
-      这个线上隐私政策只适用于通过我们站点收集到的信息，并不包括线下收集的信息。
+      本在线隐私政策仅适用于通过我们网站收集的信息，不适用于离线收集的信息。
 
       <a name="consent"></a>
 
       ## [您的同意](#consent)
 
-      您使用站点的同时，代表您同意了我们网站的隐私政策。
+      使用我们的网站，即表示您同意我们网站的隐私政策。
 
       <a name="changes"></a>
 
-      ## [隐私政策的更改](#changes)
+      ## [隐私政策的变更](#changes)
 
-      如果我们决定更改我们的隐私政策，我们将在此页更新这些改变。
+      如果我们决定更改我们的隐私政策，我们将在此页面上发布这些变更。
 
-      文档以 CC-BY-SA 发布。最后更新时间为2013年5月31日。
+      本文档根据 CC-BY-SA 发布。最后更新时间为 2013 年 5 月 31 日。
   badges:
     mass_award:
       errors:
-        invalid_csv: 我们在第%{line_number}行遇到一个错误。请确认CSV中每一行有一个电子邮件地址。
-        badge_disabled: 请先启用 %{badge_name} 徽章。
+        invalid_csv: 我们在第 %{line_number} 行遇到错误。请确认 CSV 每行有一个电子邮件。
+        too_many_csv_entries: CSV 文件中的条目过多。请提供包含不超过 %{count} 个条目的 CSV 文件。
+        badge_disabled: 请先启用%{badge_name}徽章。
+        cant_grant_multiple_times: 无法多次向单个用户授予%{badge_name}徽章。
     editor:
-      name: 编辑
+      name: 编辑者
       description: 首次编辑帖子
       long_description: |
-        该徽章授予给第一次编辑自己帖子的您。虽然您不能永远在编辑自己的帖子，但鼓励编辑 - 您可以改进格式，修正小错误，或者是增补您原来没有写的内容。编辑能让您的帖子质量变得更好！
+        当您第一次编辑您的帖子时，将授予此徽章。虽然您无法永远编辑您的帖子，但我们鼓励您进行编辑 - 您可以改进格式，修正小错误或添加您最初发布时遗漏的任何内容。编辑以使您的帖子更出色！
     wiki_editor:
-      name: 维基编者
-      description: 首次编辑维基
+      name: Wiki 编辑
+      description: 首次编辑 Wiki
       long_description: |
-        该徽章授予给第一次编辑维基帖子的您。
+        当您第一次编辑 Wiki 帖子时，将授予此徽章。
     basic_user:
-      name: 初级用户
-      description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">授予</a>所有常用社区功能
+      name: 基本用户
+      description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">授予</a>所有基础社区功能
       long_description: |
-        该徽章授予给用户等级达到 1 的成员。感谢您在社区里花了一些时间并且阅读了一些帖子，了解了我们的社区。您的新用户限制已经被取消；并且您已经被授予了所有基本的社区权限，必须个人私信、标记、维基编辑和发布多张图片和多个链接的能力。
+        当您达到信任级别 1 时，将授予此徽章。感谢您坚持阅读一些话题以了解我们社区的内容。新用户限制已被取消；您已被授予所有基础社区功能，例如个人消息、举报、Wiki 编辑以及发布多个图片和链接的权限。
     member:
-      name: 社区成员
-      description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">授予</a>邀请、群组消息和更多的赞
+      name: 成员
+      description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">被授予</a>邀请、群组消息、更多赞
       long_description: |
-        该徽章授予给达到信用等级2的您。感谢您在社区待了几周，真正融入到了社区中。现在您可以在您的用户页或单个话题中邀请他人加入，或者创建群组私信，同时也可以在每一天给出更多的赞。
+        当您达到信任级别 2 时，将授予此徽章。感谢您在几周内参与并真正加入我们的社区。您现在可以从您的用户页面或单个话题发送邀请，创建群组个人消息，以及每天获得更多赞。
     regular:
       name: 活跃用户
-      description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">授予</a>重分类、重命名、重命名、跟随链接、维基还有更多的赞
+      description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">授予</a>重新分类、重命名、关注链接、Wiki、更多赞
       long_description: |
-        该徽章授予给达到信用等级3的您。感谢您在这几个月持续地参与社区。您现在是我们之中最活跃的读者之一了，您持续的贡献极大地帮助了我们的社区。您现在可以重新分类或者重命名话题、使用能力强大的垃圾标记功能以及访问隐藏的贵宾分类了，并且您还可以每一天送出更多的赞。
+        当您达到信任级别 3 时，将授予此徽章。感谢您在几个月的时间里成为我们社区的活跃用户。您现在是最活跃的读者之一，并且是使我们的社区变得伟大的可靠贡献者。现在，您可以重新分类和重命名话题，利用更强大的垃圾信息举报，访问贵宾室区域，并且每天还会获得更多赞。
     leader:
-      name: 资深
-      description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">授予</a>全局编辑、置顶、关闭、归档、分割、合并帖子的权限，还有更多的赞
+      name: 领导者
+      description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">授予</a>全局编辑、置顶、关闭、归档、拆分与合并、更多赞
       long_description: |
-        当您达到信任等级 4 时，将被授予此徽章。您是管理人员选作的社区中的领导者，您的行为和言辞，为社区中的其他人树立了积极的榜样。 您现在可以编辑所有的帖子，使用常见的话题管理操作，例如置顶，关闭，不在列表中显示，归档，分割和合并。
+        当您达到信任级别 4 时，将授予此徽章。您被管理人员选为此社区的领导者，您在这里的言行为社区其他人树立了积极的榜样。您可以编辑所有帖子，执行常见的话题版主操作，例如置顶、关闭、取消公开、归档、拆分与合并。
     welcome:
       name: 欢迎
-      description: 收到了一个赞
+      description: 收到一个赞
       long_description: |
-        该徽章授予给帖子收到了第一个赞的您。恭喜，有社区成员觉得您发布的内容有意思、酷炫或者是有用的！
+        当您在帖子上收到第一个赞时，将授予此徽章。恭喜，您发布了一些社区成员认为有趣、酷或有用的内容！
     autobiographer:
       name: 自传作者
-      description: 填写<a href="%{base_uri}/my/preferences/profile">用户资料</a>信息
+      description: 填写<a href="%{base_uri}/my/preferences/profile">个人资料</a>信息
       long_description: |
-        该徽章授予给填写了<a href="%{base_uri}/my/preferences/profile">用户资料页</a>并设置了用户头像的您。让社区成员们多了解您一点以及您感兴趣的内容，能帮助我们打造一个更好、更团结的社区。让我们一起努力！
+        当您填写<a href="%{base_uri}/my/preferences/profile">用户个人资料</a>并设置了个人资料照片时，将授予此徽章。让社区更多地了解您是谁以及您对什么感兴趣，这有助于建立一个更好、联系更紧密的社区。加入我们！
     anniversary:
-      name: 年度纪念日
-      description: 一年活跃用户，至少发了一个帖子
+      name: 周年纪念日
+      description: 已成为有效用户一年，并且至少发帖一次
       long_description: |
-        该徽章授予给在社群注册一年并超至少发布了一个帖子的您。感谢您的持续关注和对我们社区的贡献！我们希望您继续参与我们的社区。
+        当您成为成员一年并在此期间至少发布一个帖子时，将授予此徽章。感谢您坚持并为我们的社区做出贡献。没有您，我们做不到。
     nice_post:
       name: 不错的回复
-      description: 在单个回复中收获10个赞
+      description: 回复获得 10 个赞
       long_description: |
-        该徽章授予给回复得到10个赞的您。您的回复给社区成员们留下了印象，并且您推动了讨论的进程。
+        当您的回复获得 10 个赞时，将授予此徽章。您的回复给社区留下了深刻印象，并帮助推动了对话。
     good_post:
       name: 很棒的回复
-      description: 在单个回复中收获25个赞
+      description: 回复获得 25 个赞
       long_description: |
-        该徽章授予给回复得到25个赞的您。您的回复很杰出，而且让讨论更有意思了。
+        当您的回复获得 25 个赞时，将授予此徽章。您的回复很特别，让对话变得更有趣。
     great_post:
       name: 精彩的回复
-      description: 单个回复收获50个赞
+      description: 回复获得 50 个赞
       long_description: |
-        该徽章授予给回复收到50个赞的您。哇！您的回复很有启发、引经据典、令人冷俊不禁或者十分有内涵，整个社区都赞它！
+        当您的回复获得 50 个赞时，将授予此徽章。哇！您的回复鼓舞人心、引人入胜、风趣幽默或富有洞察力，社区都很喜欢！
     nice_topic:
       name: 不错的话题
-      description: 单个话题收获10个赞
+      description: 话题获得 10 个赞
       long_description: |
-        该徽章授予给话题收到10个赞的您。您创建了一个社区成员觉得有意思的讨论！
+        当您的话题获得 10 个赞时，将授予此徽章。您开始了一个社区喜欢的有趣对话。
     good_topic:
       name: 很好的话题
-      description: 单个话题收获25个赞
+      description: 话题获得 25 个赞
       long_description: |
-        该徽章授予给话题收到25个赞的您。您创建了一个有意义的话题，整个社区都在积极响应。
+        当您的话题获得 25 个赞时，将授予此徽章。您发起了一场充满活力的对话，将社区团结起来。
     great_topic:
       name: 精彩的话题
-      description: 单个话题收获50个赞
+      description: 话题获得 50 个赞
       long_description: |
-        该徽章授予给话题获得50个赞的您。您创建了一个引人入胜的话题，整个社区都沉浸于讨论之中。
+        当您的话题获得 50 个赞时，将授予此徽章。您开启了一场引人入胜的对话，社区喜欢由此产生的热烈讨论！
     nice_share:
       name: 不错的分享
-      description: 分享了一个有 25 个独立访问者的帖子
+      description: 与 25 个唯一身份访客分享帖子
       long_description: |
-        该徽章授予给分享链接给 25 个其他访客的您。感谢您广而告之我们的讨论，和对这个社区的帮助。
+        当您分享的链接被 25 个外部访客点击时，将授予此徽章。感谢您传播有关我们的讨论和这个社区的信息。
     good_share:
       name: 很棒的分享
-      description: 分享了一个有 300 个独立访问者的帖子
+      description: 与 300 个唯一身份访客分享帖子
       long_description: |
-        该徽章授予给分享链接给 300 个其他访客的您。干得漂亮！您把一个有意思的讨论介绍给了许多新的朋友，并且帮助社区前进了一步。
+        当您分享的链接被 300 个外部访客点击时，将授予此徽章。干得漂亮！您向一群新人展示了一场精彩的讨论，并帮助这个社区成长。
     great_share:
       name: 精彩的分享
-      description: 分享了一个有 1000 个独立访问者的帖子
+      description: 与 1000 个唯一身份访客分享帖子
       long_description: |
-        该徽章授予给分享链接给 1000 个其他访客的您。哇！您把一个有意思的讨论推广给了广大的读者们，并且帮助社区前进了一大步！
+        当您分享的链接被 1000 个外部访客点击时，将授予此徽章。哇！您将一个有趣的讨论介绍给大量新受众，并帮助社区前进了一大步！
     first_like:
-      name: 首赞
+      name: 第一个赞
       description: 赞了一个帖子
       long_description: |
-        该徽章授予给首次使用 :heart: 按钮赞了一个帖子的您。点赞帖子是一个让社区成员知道他们所发布的内容是实用或有趣的一个好方法。分享这种热情吧！
+        当您首次使用 :heart: 按钮赞一个帖子时，将授予此徽章。点赞帖子是让社区成员知道他们所发布的内容有趣、实用、炫酷的绝佳方法。分享爱！
     first_flag:
-      name: 首次标记
-      description: 已标记过了一个帖子
+      name: 首次举报
+      description: 举报了一个帖子
       long_description: |
-        该徽章授予给第一次标记帖子的您。标记是帮助我们帮助社区保持良好的工具。如果您注意到哪个帖子需要版主的注意，不用在乎什么原因，直接标记。如果您注意到别人帖子里的某个问题。如果您发现了问题，:flag_black: 标记吧！
+        当您首次举报帖子时，将授予此徽章。举报是我们所有人帮助保持这里成为适合每个人的好地方的方式。如果您发现任何帖子因任何原因需要版主注意，请尽管举报。如果您看到一个问题，:flag_black: 举报它！
     promoter:
       name: 推广者
-      description: 已邀请了 1 个用户
+      description: 邀请了一个用户
       long_description: |
-        该徽章授予给邀请他人加入社区的您。您曾使用了用户页面的邀请按钮或话题底部的邀请按钮。邀请对某个讨论感兴趣的朋友是引介新人的好办法，非常感谢！
+        当您通过您的用户页面上或话题底部的邀请按钮邀请某人加入社区时，将授予此徽章。邀请可能对特定讨论感兴趣的朋友是向我们的社区介绍新人的绝佳方法，谢谢！
     campaigner:
       name: 活动家
-      description: 已邀请了 3 个初级用户
+      description: 邀请了 3 个基本用户
       long_description: |
-        该徽章授予给邀请了 3 人加入社区的您，您的朋友在站点上度过了很长的时间，已经成为了基础用户。活跃的社区需要新鲜的血液日常参与，并为交流带来多元视点。
+        当您邀请 3 位随后在站点上花费足够时间成为基本用户的人时，将授予此徽章。一个充满活力的社区需要定期注入新人，他们定期参与并在对话中添加新的声音。
     champion:
-      name: 外交官
-      description: 已邀请了 5 个成员
+      name: 拥护者
+      description: 邀请了 5 个成员
       long_description: |
-        该徽章授予给邀请了 5 人加入社区的您，您的朋友在站点上度过了很长的时间，已经成为了成员。哇！感谢您帮助社区成长，社区因此变得更多元了！
+        当您邀请 5 位随后在网站上花费足够时间成为正式会员的人时，将授予此徽章。哇！感谢您通过新成员扩大我们社区的多元化！
     first_share:
       name: 首次分享
-      description: 已分享了一个帖子
+      description: 分享了一个帖子
       long_description: |
-        该徽章授予给第一次用分享按钮分享了回复或者话题的链接的成员。分享链接是一个极好的方式向外部世界展示有趣的讨论的方法，并且能推动社区增长。
+        当您第一次使用分享按钮分享回复或话题的链接时，将授予此徽章。分享链接是向世界其他地方展示有趣讨论和发展您的社区的绝佳方法。
     first_link:
-      name: 首个链接
-      description: 已链接了另一个话题
+      name: 首次链接
+      description: 添加了指向另一个话题的链接
       long_description: |
-        该徽章授予给第一次链接到另一个话题的您。联结话题会在各个话题的右侧显示链接和标题，这可以帮助阅读者迅速地找到相关讨论。多链接一些话题吧！
+        当您第一次添加指向其他话题的链接时，将授予此徽章。通过在两个方向上显示话题之间的联系，链接话题可以帮助其他读者找到有趣的相关对话。多链接一些话题吧！
     first_quote:
       name: 首次引用
-      description: 已引用过一个帖子
+      description: 引用了一个帖子
       long_description: |
-        该徽章授予给第一次在回复中引用帖子的您。在您的回复中引用之前帖子中的相关的部分将把话题关联在一起并切题。只要选中别的帖子中的任何文字，然后点击回复按钮将可以引用啦。多引用一些吧！
+        当您首次在回复中引用帖子时，将授予此徽章。在您的回复中引用之前帖子的相关部分有助于将讨论联系在一起并围绕话题进行。最简单的引用方法是突出显示帖子的某个部分，然后按任意回复按钮。慷慨地引用吧！
     read_guidelines:
-      name: 阅读指引
-      description: 阅读<a href="%{base_uri}/guidelines">社区指引</a>
+      name: 阅读准则
+      description: 阅读<a href="%{base_uri}/guidelines">社区准则</a>
       long_description: |
-        该徽章授予给<a href="%{base_uri}/guidelines">阅读了社区指引</a>的您。遵守和分享简单的指引能让我们打造一个稳定、有趣和可持续的社区。永远记住别人，一个和您有很多共同点的人，就在屏幕的那一侧。友好一些！
+        当您<a href="%{base_uri}/guidelines">阅读社区准则</a>后，将授予此徽章。遵守和分享简单的准则可以帮助我们打造一个稳定、有趣和可持续的社区。永远记住其他人，一个和您有很多共同点的人，就在屏幕的那一侧。友好一些！
     reader:
       name: 读者
-      description: 阅读了有至少 100 个回复的话题中的所有回复
+      description: 阅读超过 100 个回复的话题中的每个回复
       long_description: |
-        该徽章授予给第一次阅读了超过 100 个回复的长话题的您。仔细地阅读对话内容能让您关注到讨论的中心，理解不同的观点，而且能帮助我们打造更有趣的对话情景。您读得越多，对话的效果就会越好。就如我们常说的那般，阅读是最重要的！ :slight_smile:
+        当您第一次阅读超过 100 个回复的长话题时，将授予此徽章。仔细阅读对话可以帮助您跟踪讨论，理解不同的观点，并推动更有趣的对话。您读得越多，对话就越好。正如我们常说的，阅读是基础！:slight_smile:
     popular_link:
-      name: 流行链接
+      name: 热门链接
       description: 分享的链接被点击了 50 次
       long_description: |
-        该徽章授予给分享的链接被点击过 50 次的您。感谢您贴出了有用的链接，这让讨论的情节更形象了！
+        当您分享的链接获得 50 次点击时，将授予此徽章。感谢您发布一个有用的链接，为对话添加了有趣的上下文！
     hot_link:
-      name: 热门链接
+      name: 火热链接
       description: 分享的链接被点击了 300 次
       long_description: |
-        该徽章授予给分享的链接被点击过 300 次的您。感谢您贴出了精彩的链接，这推进了讨论的进程，并且装点了讨论！
+        当您分享的链接获得 300 次点击时，将授予此徽章。感谢您发布一个引人入胜的链接，推动对话向前发展并点亮了讨论！
     famous_link:
       name: 著名链接
       description: 分享的链接被点击了 1000 次
       long_description: |
-        该徽章授予给分享的链接被点击过 1000 次的您。哇！您贴出的链接明显地推动了交流，它提供了重要的细节、上下文和其他信息，干得好！
+        当您分享的链接获得 1000 次点击时，将授予此徽章。哇！您发布了一个链接，它通过添加基本细节、上下文和信息显著改善了对话。做得好！
     appreciated:
-      name: 感谢
+      name: 受到赞赏
       description: 有 20 个帖子都被赞了 1 次
       long_description: |
-        该徽章授予给 20 个不同的帖子都收到了至少 1 个赞的您。社区感谢您对讨论的贡献！
+        当您在 20 个不同的帖子上至少获得一个赞时，将授予此徽章。社区正在享受您对这里的对话的贡献！
     respected:
-      name: 尊敬
-      description: 在100个帖子内收获2个赞
+      name: 受人尊敬
+      description: 有 100 个帖子都被赞了 2 次
       long_description: |
-        该徽章授予给 100 个不同的帖子都收到了至少 2 个喜欢的您。社区越来越尊重您在讨论中的贡献了。
+        当您在 100 个不同的帖子上至少获得 2 个赞时，将授予此徽章。社区越来越尊重您对这里的许多对话的贡献。
     admired:
-      name: 敬仰
+      name: 受人敬仰
       description: 有 300 个帖子都被赞了 5 次
       long_description: |
-        该徽章授予给 300 个不同的帖子都收到了至少 5 个赞的您。哇！社区敬仰您在讨论中频繁和高质量的贡献。
+        当您在 300 个不同的帖子上至少获得 5 个赞时，将授予此徽章。哇！社区钦佩您对这里的对话频繁、高质量的贡献。
     out_of_love:
-      name: 热情
-      description: 一天内给出了%{max_likes_per_day}个赞
+      name: 出于爱
+      description: 一天内顶额送出 %{max_likes_per_day} 个赞
       long_description: |
-        该徽章授予给一天内给出了%{max_likes_per_day}个赞的您。别忘记休息一下，喜欢您所欣赏的帖子能鼓励社区在将来创造更多更精彩的讨论。
+        当您一天内顶额送出 %{max_likes_per_day} 个赞时，将授予此徽章。记得花点时间点赞您喜欢和欣赏的帖子，这会鼓励您的社区成员在未来创造更多精彩讨论。
     higher_love:
-      name: 激情
-      description: 共5次一天内给出了%{max_likes_per_day}个赞
+      name: 更多的爱
+      description: 一天内顶额送出 %{max_likes_per_day} 个赞，并达到 5 次
       long_description: |
-        此徽章授予给共5天用完每天%{max_likes_per_day}个赞的您。感谢您每天花时间积极鼓励最好的交流！
+        当您在一天内顶额送出 %{max_likes_per_day} 个赞并达到 5 次时，将授予此徽章。感谢您抽出时间每天积极鼓励进行最佳对话！
     crazy_in_love:
       name: 狂热
-      description: 共20次一天内给出了%{max_likes_per_day}个赞
+      description: 一天内顶额送出 %{max_likes_per_day} 个赞，并达到 20 次
       long_description: |
-        此徽章授予给每天都给出所有%{max_likes_per_day}个赞的您。哇！您是鼓励社区成员的榜样！
+        当您在一天内顶额送出 %{max_likes_per_day} 个赞并达到 20 次时，将授予此徽章。哇！您是鼓励社区成员的榜样！
     thank_you:
-      name: 感谢您
-      description: 有 20 个被赞的帖子，给出过 10 个赞
+      name: 谢谢
+      description: 有 20 个被赞的帖子，并送出了 10 个赞
       long_description: |
-        该徽章授予给收到了 20 个赞，且赞过别人至少 10 次的您。当别人赞您的帖子的时候，您也找机会赞别人的帖子。
+        当您拥有 20 个被赞的帖子并送出 10 个或更多赞作为回报时，将授予此徽章。当有人赞您的帖子时，您也应当花时间去赞其他人的帖子。
     gives_back:
       name: 回馈
-      description: 有 100 个被赞的帖子，给出过 100 个赞
+      description: 有 100 个被赞的帖子，并送出了 100 个赞
       long_description: |
-        该徽章授予给收到了 100 个赞，且赞过别人至少 100 次的您。感谢您分享感激！
+        当您拥有 100 个被赞的帖子并送出 100 个或更多赞作为回报时，将授予此徽章。感谢您分享感激！
     empathetic:
-      name: 感性
-      description: 有 500 个被赞的帖子，并给出过 1000 个赞
+      name: 善解人意
+      description: 有 500 个被赞的帖子，并送出了 1000 个赞
       long_description: |
-        该徽章授予给收到了 500 个赞，且赞过别人至少 1000 次的您。哇！您是一个富有同情心且会换位思考的模范。 :two_hearts:
+        当您拥有 500 个被赞的帖子并送出 1000 个或更多赞作为回报时，将授予此徽章。哇！您是一个慷慨且会换位思考的模范。:two_hearts:
     first_emoji:
-      name: 首个表情
+      name: 第一个表情符号
       description: 在帖子中使用表情符号
       long_description: |
-        该徽章授予给第一次在帖子中使用 Emoji 的您 :thumbsup:。Emoji 让您在帖子中表达快乐 :smiley:、悲伤 :anguished:、愤怒 :angry: 以及任何东西 :sunglasses:。输入 :（冒号）或在编辑器中的 Emoji 工具栏中选择吧 :ok_hand:
+        当您首次在帖子中添加表情符号 :thumbsup: 时，将授予此徽章。表情符号让您可以在帖子中传达情感，从快乐 :smiley: 到悲伤 :anguished:，再到愤怒 :angry:，以及 :sunglasses: 之间的一切。只需输入 :（冒号）或按编辑器中的表情符号工具栏按钮即可从数百个选项中进行选择 :ok_hand:
     first_mention:
       name: 首次提及
-      description: 帖子中提及用户
+      description: 在帖子中提及用户
       long_description: |
-        该徽章授予给第一次在帖子中@别人的您。每个提及都将通知对方，让他们知道您发了贴。输入 @ 提及任何用户，如果可以的话，也可以提及群组——这是个获得他们注意的好办法。
+        当您第一次在帖子中提及 (@) 某人的用户名时，将授予此徽章。每次提及都会向此人发送通知，以便他们了解您的帖子。只需输入 @ 即可提及任何用户或群组（如果允许）- 这是一种引起他们注意的便捷方式。
     first_onebox:
-      name: 首个Onebox
-      description: 发布过 oneboxed 链接
+      name: 首个 Onebox
+      description: 发布了一个 Onebox 链接
       long_description: |
-        该徽章授予给第一次发表单独一行链接的您。链接将展开成一个标签盒，其中包含摘要、标题和（可能的）图片。
+        当您第一次在一行上单独发布链接时，将授予此徽章。该链接会自动扩展为带有摘要、标题和图片（如果可用）的 Onebox。
     first_reply_by_email:
-      name: 首次邮件回复
-      description: 通过邮件回复
+      name: 第一次通过电子邮件回复
+      description: 通过电子邮件回复帖子
       long_description: |
-        该徽章授予给第一次通过邮件回复的您 :e-mail:。
+        当您第一次通过电子邮件 :e-mail: 回复帖子时，将授予此徽章。
     new_user_of_the_month:
-      name: "本月最佳新用户"
-      description: 第一个月做出杰出贡献
+      name: "当月最佳新用户"
+      description: 在第一个月做出杰出贡献
       long_description: |
-        该徽章授予给每个月中做出杰出贡献的两位新用户。这是根据您收到的赞和谁赞了您决定的。
+        此徽章每个月被授予做出杰出贡献的两个新用户。整体贡献根据他们的帖子被赞的频率和被谁赞进行衡量。
     enthusiast:
-      name: 十全十美
+      name: 爱好者
       description: 连续 10 天访问
       long_description: |
-        连续 10 天访问论坛会被授予该勋章。感谢与我们共度超过一周的时光！
+        连续 10 天访问论坛会被授予此勋章。感谢与我们共度超过一周的时光！
     aficionado:
       name: 百尺竿头
       description: 连续 100 天访问
       long_description: |
-        连续 100 天访问论坛会被授予该勋章。这可是超过三个月的时间！
+        连续 100 天访问论坛会被授予此勋章。这可是超过三个月的时间！
     devotee:
       name: 全年不落
       description: 连续 365 天访问
       long_description: |
-        连续365 天访问论坛会被授予该勋章。哇哦，一整年了！
-    badge_title_metadata: "%{site_title}的%{display_name}徽章"
+        连续 365 天访问论坛会被授予此勋章。哇哦，一整年！
+    badge_title_metadata: "%{site_title}上的%{display_name}徽章"
   admin_login:
-    success: "邮件已发送"
+    success: "电子邮件已发送"
     errors:
-      unknown_email_address: "未知电子邮箱地址。"
-      invalid_token: "令牌无效。"
-    email_input: "管理员邮件"
-    submit_button: "发送邮件"
+      unknown_email_address: "未知的电子邮件地址。"
+      invalid_token: "无效令牌。"
+    email_input: "管理员电子邮件"
+    submit_button: "发送电子邮件"
   performance_report:
-    initial_post_raw: 这个话题将用来展示网站每日性能报告。
-    initial_topic_title: 网站性能报告
+    initial_post_raw: 此话题包括您站点的每日表现报告。
+    initial_topic_title: 网站表现报告
   tags:
     title: "标签"
     restricted_tag_disallowed: '您不能添加标签“%{tag}”。'
-    restricted_tag_remove_disallowed: '您不能删除标签“%{tag}”。'
+    restricted_tag_remove_disallowed: '您不能移除标签“%{tag}”。'
     minimum_required_tags:
-      other: "您必须选择至少%{count}个标签"
-    upload_row_too_long: "CSV文件每行应该有一个标签。可选地，标签后面可以是逗号，然后是标签组名称。"
+      other: "您必须至少选择 %{count} 个标签。"
+    upload_row_too_long: "CSV 文件的每行应该有一个标签。或者，标签后面可以跟一个逗号，然后是标签组名称。"
     forbidden:
       invalid:
-        other: "您选择的可以使用的标签为空"
-      in_this_category: '"%{tag_name}不能用于此分类"'
+        other: "您选择的标签均无法使用"
+      in_this_category: '“%{tag_name}”不能用于此类别'
       restricted_to:
-        other: '“%{tag_name}”被限制在以下分类：%{category_names}'
-      synonym: '不允许使用同义词。使用“ %{tag_name}”代替。'
-      has_synonyms: '无法使用“ %{tag_name}”，因为有同义词。'
+        other: '“%{tag_name}”仅限于以下类别：%{category_names}'
+      synonym: '不允许使用同义词。改用“%{tag_name}”。'
+      has_synonyms: '无法使用“%{tag_name}”，因为有同义词。'
     required_tags_from_group:
-      other: "您必须至少包括 %{count} %{tag_group_name} 标签。该组中的标签为：%{tags}。"
+      other: "您必须至少包含 %{count} 个%{tag_group_name}标签。此组中的标签包括：%{tags}。"
     invalid_target_tag: "不能是同义词的同义词"
     synonyms_exist: "存在同义词时不允许"
-  rss_by_tag: "话题标签 %{tag}"
+  rss_by_tag: "使用%{tag}标记的话题"
   finish_installation:
-    congratulations: "祝贺，您已经安装好了 Discourse！"
+    congratulations: "恭喜，您已安装 Discourse！"
     register:
       button: "注册"
-      title: "注册管理员账户"
-      help: "注册新账户以开始"
-      no_emails: "遗憾的是，在设置过程中未定义管理员电子邮件，因此最终确定配置可能很困难。请在配置文件中添加开发人员电子邮件或<a href='https://meta.discourse.org/t/create-admin-account-from-console/17274'>从控制台创建管理员账户</a>。"
+      title: "注册管理员帐户"
+      help: "注册新帐户以开始"
+      no_emails: "很抱歉，在设置过程中没有定义管理员电子邮件，因此完成配置可能很困难。请在配置文件中添加开发者电子邮件或<a href='https://meta.discourse.org/t/create-admin-account-from-console/17274'>从控制台创建管理员帐户</a>。"
     confirm_email:
-      title: "配置您的邮件"
-      message: "<p>我们发送了一封激活邮件到<b>%{email}</b>。请安装电子邮件中的说明激活您的帐号。</p><p>如果没有收到，检查您的收件箱的垃圾箱或者<a href='https://meta.discourse.org/t/troubleshooting-email-on-a-new-discourse-install/16326'>确认您的电子邮件地址是正确的</a>。</p>"
+      title: "确认您的电子邮件"
+      message: "<p>我们向 <b>%{email}</b> 发送了一封激活邮件。请按照电子邮件中的说明激活您的帐户。</p><p>如果没有收到，请检查您的垃圾邮件文件夹并<a href='https://meta.discourse.org/t/troubleshooting-email-on-a-new-discourse-install/16326'>确保您正确设置了电子邮件</a>。</p>"
     resend_email:
-      title: "重发激活邮件"
-      message: "<p>我们重发了激活邮件至<b>%{email}</b>"
+      title: "重新发送激活电子邮件"
+      message: "<p>我们已将激活电子邮件重新发送至 <b>%{email}</b>"
   safe_mode:
     title: "进入安全模式"
-    description: "安全模式让您的站点不载入插件或站点自定义设置。"
+    description: "安全模式允许您在不加载插件或站点自定义的情况下测试您的站点。"
     no_customizations: "禁用当前主题"
     only_official: "禁用非官方插件"
     no_plugins: "禁用所有插件"
     enter: "进入安全模式"
-    must_select: "您必须选择至少一个选项以进入安全模式。"
+    must_select: "您必须至少选择一个选项才能进入安全模式。"
   wizard:
-    title: "Discourse 安装"
+    title: "Discourse 设置"
     step:
       locale:
         title: "欢迎来到 Discourse！"
         fields:
           default_locale:
-            description: "您的社区主要使用什么语言？"
+            description: "您社区的默认语言是什么？"
       forum_title:
-        title: "名字"
-        description: "名字就像远方可见的路标一样，访客“首先”将看到这个社区的名字。您起的名字和标题怎样描述了您的社区？"
+        title: "名称"
+        description: "名称是醒目标志，它是您的社区给潜在访客留下的<i>第一</i>印象。名称和标题如何传达您的社区的主旨？"
         fields:
           title:
-            label: "您社区的名字"
-            placeholder: "小明的论坛"
+            label: "您社区的名称"
+            placeholder: "朱桦的环聊"
           site_description:
-            label: "用一句简短的话描述您的社区"
-            placeholder: "小明和他的朋友讨论酷东西的论坛"
+            label: "用一句话描述您的社区"
+            placeholder: "朱桦和她的朋友讨论新奇事物的地方"
           short_site_description:
-            label: "用几句话来描述您的社区"
+            label: "用几个词描述您的社区"
             placeholder: "有史以来最好的社区"
       introduction:
         title: "介绍"
-        disabled: "<p>我们找不到任何标题为“%{topic_title}”的话题。</p> <ul> <li>如果您更改了标题，请修改该话题以修改您网站的介绍。</li> <li>如果您已删除此话题，请创建另一个话题为“%{topic_title}”作为标题。 第一篇文章的内容是您网站的介绍。</li> </ul>"
+        disabled: "<p>我们找不到标题为“%{topic_title}”的任何话题。</p> <ul> <li>如果您更改了标题，请编辑该话题以修改您站点的介绍性文字。</li> <li>如果您已删除此话题，请使用“%{topic_title}”作为标题创建另一个话题。第一个帖子的内容是您站点的介绍性文字。</li> </ul>"
         fields:
           welcome:
             label: "欢迎话题"
-            description: "<p>您如何向一个在电梯里的陌生人用一分钟时间介绍您的社区？</p> <ul> <li>谁会参与讨论？</li> <li>我在这里能找到些什么？</li> <li>为什么我要来这里？</li> </ul> <p>您的欢迎话题是初来者首先所需要阅读的。 把它当成您的 <b>一句话</b> '电梯游说' 或 ' 使命陈述'。 </p>"
-            one_paragraph: "请限制您的欢迎私信至一段话。"
-            extra_description: "如果您不确定，可以跳过此步骤，稍后编辑您的欢迎话题。"
+            description: "<p>您会如何在大约 1 分钟内在电梯上向陌生人描述您的社区？</p> <ul> <li>这些讨论针对谁？</li> <li>我可以在这里找到什么？</li> <li>我为什么要访问？</li> </ul> <p>您的欢迎话题是新人首先阅读的内容。将其视为您的<b>一段</b>“电梯演讲”或“使命宣言”。</p>"
+            one_paragraph: "请将您的欢迎消息限制为一段。"
+            extra_description: "如果您不确定，可以跳过此步骤并稍后编辑您的欢迎话题。"
       privacy:
         title: "访问"
-        description: "<p>您的社区对所有人开放，还在是限制会员、邀请或审批？您可以随意设置为私有的然后切换到公开的。</p>"
+        description: "<p>您的社区是对所有人开放，还是受到成员资格、邀请或审批的限制？如果您愿意，可以设置为不公开，稍后再切换到公开。</p>"
         fields:
           privacy:
             choices:
               open:
                 label: "公开"
-                description: "任何人都可访问这个社区"
+                description: "任何人都可以访问此社区"
               restricted:
-                label: "私密"
-                description: "仅登录用户可以访问这个社区"
+                label: "不公开"
+                description: "只有登录用户才能访问此社区"
           privacy_options:
-            description: "新用户将如何注册一个账户？"
+            description: "新用户如何注册帐户？"
             choices:
               open:
                 label: "用户可以自行注册。"
               invite_only:
-                label: "用户需经过信任用户或员工邀请才能注册。"
+                label: "用户必须由受信任的用户或管理人员邀请才能注册。"
               must_approve:
-                label: "用户可以自行注册，但需经过员工同意。"
+                label: "用户可自行注册，但须经管理人员批准。"
       contact:
         title: "联系"
         fields:
           contact_email:
             label: "邮件"
             placeholder: "name@example.com"
-            description: "社区的负责人或群组的邮件地址。将用来接收关于未处理标记和安全更新的紧急通知，并显示在<a href='%{base_path}/about' target='_blank'>关于页面</a>上作为紧急联系的方式。"
+            description: "负责此社区的个人或群组的电子邮件地址。用于重要通知（例如未处理的举报、安全更新），以及在<a href='%{base_path}/about' target='_blank'>您的“关于”页面</a>上用于紧急社区联系。"
           contact_url:
             label: "网页"
             placeholder: "https://www.example.com/contact-us"
-            description: "您或者您的组织平时用于联络的网页。将被显示在<a href='%{base_path}/about' target='_blank'>关于页面</a>中。"
+            description: "您或您的组织的一般联系网页。将显示在<a href='%{base_path}/about' target='_blank'>您的“关于”页面</a>上。"
           site_contact:
-            label: "自动私信"
-            description: "所有Discourse自动发送的消息将以该用户的名义发送，比如标志警告和备份完成通知。"
+            label: "自动消息"
+            description: "所有自动 Discourse 个人消息都将从此用户发送，例如举报警告和备份完成通知。"
       corporate:
         title: "组织"
-        description: "此信息将输入您的<a href='%{base_path}/tos' target='blank'>服务条款</a>，这是您可以在员工类别中编辑的话题。如果您没有公司，现在可跳过此步骤。"
+        description: "此信息将被输入您的<a href='%{base_path}/tos' target='blank'>服务条款</a>，后者是您可以在“管理人员”类别中编辑的话题。如果您没有公司，可以暂时跳过此步骤。"
         fields:
           company_name:
-            label: "公司名"
+            label: "公司名称"
             placeholder: "示例组织"
           governing_law:
             label: "适用法律"
             placeholder: "加州法律"
           city_for_disputes:
             label: "争议之城"
-            placeholder: "旧金山，加利福尼亚"
+            placeholder: "加利福尼亚州旧金山"
       colors:
         title: "颜色"
       fonts:
@@ -4157,180 +4323,180 @@ zh_CN:
           font_preview:
             label: "预览"
       logos:
-        title: "标志"
+        title: "徽标"
         fields:
           logo:
-            label: "主要Logo"
-            description: "您的站点左上角标志图像。使用高120且宽高比大于3:1的长方形图像。"
+            label: "主要徽标"
+            description: "您的站点左上角的徽标图片。使用高度为 120 且宽高比大于 3:1 的宽矩形图片。"
           logo_small:
-            label: "正方形标志"
-            description: "您的标志的正方形版本。在浏览器下滑时显示在左上角，还显示在分享到社交网络时。推荐大于512x512。"
+            label: "方形徽标"
+            description: "您徽标的方形版本。向下滚动时、在浏览器中以及在社交平台上分享时，会显示在您站点的左上角。理想情况下，大于 512x512。"
       icons:
         title: "图标"
         fields:
           favicon:
             label: "浏览器图标"
-            description: "用于在浏览器上代表您的网站的图标图像，在小尺寸的情况下表现出色。推荐图像格式为PNG或JPG。我们默认会使用正方形的标志。"
+            description: "用于在网络浏览器中表示您的站点的图标图片，在小尺寸时效果不错。推荐的图片扩展名为 PNG 或 JPG。默认情况下，我们将使用方形徽标。"
           large_icon:
             label: "大图标"
-            description: "用于在现代设备上代表您的网站的图标图像，在较大尺寸的情况下表现出色。推荐尺寸大于512 × 512。我们默认会使用正方形的标志。"
+            description: "用于在现代设备上表示您的站点的图标图片，在较大尺寸下效果不错。理想情况下，大于 512 × 512。默认情况下，我们将使用方形徽标。"
       homepage:
-        description: "我们建议您在主页显示最新话题，但您喜欢的话也可以选择将分类（话题的分组）显示在主页。"
-        title: "主页"
+        description: "我们建议在您的首页上显示最新话题，但如果您愿意，您也可以在首页上显示类别（话题组）。"
+        title: "首页"
         fields:
           homepage_style:
             choices:
               latest:
                 label: "最新话题"
               categories_only:
-                label: "仅分类"
+                label: "仅类别"
               categories_with_featured_topics:
-                label: "有推荐话题的分类"
+                label: "包含精选话题的类别"
               categories_and_latest_topics:
-                label: "分类和最新话题"
+                label: "类别和最新话题"
               categories_and_top_topics:
-                label: "分类和最热话题"
+                label: "类别和热门话题"
               categories_boxes:
-                label: "分类框"
+                label: "类别框"
               categories_boxes_with_topics:
-                label: "分类框和话题"
+                label: "带有话题的类别框"
       invites:
         title: "邀请管理人员"
-        description: "您快做完啦！让我们邀请一些工作人员来帮助您创建一些有趣的话题和回复来<a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>启动您的讨论</a>以开始社区之旅。"
-        disabled: "由于禁用了本地登录，因此无法向任何人发送邀请。请继续下一步。"
+        description: "即将完成！让我们邀请一些人来使用有趣的话题和回复帮助<a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>培育您的讨论</a>以启动您的社区。"
+        disabled: "由于本地登录被禁用，因此无法向任何人发送邀请。请继续下一步。"
       finished:
-        title: "您的 Discourse 已经准备就绪！"
+        title: "您的 Discourse 已就绪！"
         description: |
-          <p>如果您想，可以<b>随时重新运行这个向导</b>，或访问 <a href='%{base_path}/admin' target='_blank'>您的管理部分</a>；在站点菜单中的扳手图标旁边找到它。</p>
-          <p>使用我们强大的话题系统，可以更轻松地自定义您的 Discourse。例如，在 <a href="https://meta.discourse.org/" target="_blank">meta.discourse.org</a>上查看 <a href="https://meta.discourse.org/c/theme/61/l/top" target="_blank">顶级话题和组件</a> 。</p>
-          <p>祝您愉快，祝您好运 <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>建立新社区！</a></p>
+          <p>如果您想更改这些设置，请<b>随时重新运行此向导</b>，或访问<a href='%{base_path}/admin' target='_blank'>您的管理员部分</a>；在站点菜单中的扳手图标旁边找到相应设置。</p>
+          <p>使用我们强大的主题系统可以轻松定制您的 Discourse。例如，请查看 <a href="https://meta.discourse.org/" target="_blank">meta.discourse.org</a> 上的<a href="https://meta.discourse.org/c/theme/61/l/top" target="_blank">热门主题和组件</a>。</p>
+          <p>玩得开心，并顺利<a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>建立您的新社区</a>！</p>
   search_logs:
     graph_title: "搜索计数"
-  joined: "已加入"
+  joined: "加入日期："
   discourse_push_notifications:
     popup:
-      mentioned: '%{username}在“%{topic}”提到了您 - %{site_title}'
-      group_mentioned: '%{username}在“%{topic}”提到了您 - %{site_title}'
-      quoted: '%{username}在“%{topic}”引用了您的帖子 - %{site_title}'
-      replied: '%{username}在“%{topic}”回复了您 - %{site_title}'
-      posted: '%{username}在“%{topic}”中发布了帖子 - %{site_title}'
-      private_message: '%{username}在“%{topic}”中给您发送了一个私信 - %{site_title}'
-      linked: '%{username}在“%{topic}”中链接了您的帖子 - %{site_title}'
-      watching_first_post: '%{username}创建一个新的话题“%{topic}”-%{site_title}'
-      confirm_title: "通知已启用 - %{site_title}"
-      confirm_body: "成功！通知已启用。"
-      custom: "来自%{username} on %{site_title}的通知"
+      mentioned: '%{username} 在“%{topic}”中提及了您 - %{site_title}'
+      group_mentioned: '%{username} 在“%{topic}”中提及了您 - %{site_title}'
+      quoted: '%{username} 在“%{topic}”中引用了您的帖子 - %{site_title}'
+      replied: '%{username} 在“%{topic}”中回复了您 - %{site_title}'
+      posted: '%{username} 在“%{topic}”中发布了帖子 - %{site_title}'
+      private_message: '%{username} 在“%{topic}”中向您发送了私信 - %{site_title}'
+      linked: '%{username} 链接到您在“%{topic}”中的帖子 - %{site_title}'
+      watching_first_post: '%{username} 创建了新话题“%{topic}”- %{site_title}'
+      confirm_title: "已启用通知 - %{site_title}"
+      confirm_body: "成功！已启用通知。"
+      custom: "来自%{site_title}上 %{username} 的通知"
   staff_action_logs:
-    not_found: "未找到"
+    not_found: "找不到"
     unknown: "未知"
-    user_merged: "%{username}已合并到此账户"
-    user_delete_self: "已从%{url}自行删除"
-    webhook_deactivation_reason: "您的webhook已被自动停用。我们收到多个“%{status}”HTTP失败状态响应。"
+    user_merged: "%{username} 已被合并到此帐户"
+    user_delete_self: "被自己从 %{url} 删除"
+    webhook_deactivation_reason: "您的网络钩子已自动停用。我们收到了多个 '%{status}' HTTP 状态失败响应。"
     api_key:
       automatic_revoked:
-        other: "自动撤销，最后活跃于%{count}日前"
-      revoked: 已撤销
+        other: "已被自动撤消，上次活动超过 %{count} 天前"
+      revoked: 已撤消
       restored: 已恢复
   reviewables:
-    already_handled: "谢谢，但我们已经审查了那篇文章，并确定它不需要再次标记。"
-    already_handled_and_user_not_exist: "谢谢，但是已经有人审核过，该用户不再存在。"
+    already_handled: "谢谢，但我们已经审核该帖子并确定不需要再次举报它。"
+    already_handled_and_user_not_exist: "谢谢，但有人已经审核过了，该用户已不存在。"
     priorities:
       low: "低"
       medium: "中"
       high: "高"
     sensitivity:
-      disabled: "停用"
+      disabled: "已禁用"
       low: "低"
       medium: "中"
       high: "高"
-    must_claim: "在您操作之前您必须认领此条目。"
+    must_claim: "在对条目采取行动之前，您必须先认领它们。"
     user_claimed: "此条目已被其他用户认领。"
-    missing_version: "您必须提供一个版本参数"
-    conflict: "有一个更新冲突阻止您这样做。"
+    missing_version: "您必须提供版本参数"
+    conflict: "有一个更新冲突阻止您执行该操作。"
     reasons:
-      post_count: "所有用户的头几个帖子必须由管理员批准。参阅`approve_post_count`。"
-      trust_level: "低信任等级用户必须有回复被管理员批准。参阅`approve_unless_trust_level`。"
-      new_topics_unless_trust_level: "低信任等级用户必须有话题被管理员批准。参阅`approve_new_topics_unless_trust_level`。"
-      fast_typer: "新用户输入第一个帖子的速度快得可疑，怀疑是机器人或垃圾制造者所为。参阅`min_firse_post_typing_time`。"
-      auto_silence_regexp: "新用户的首个帖子符合 `auto_silence_first_post_regex` 设置。"
-      watched_word: "此帖子包含敏感词，参阅<a href='%{base_url}/admin/customize/watched_words'>敏感词列表</a>。"
-      staged: "暂存用户的新话题和帖子必须由管理员批准。参阅`approve_unless_staged`。"
-      category: "此分类的帖子需要管理员批准。查看分类设置。"
-      must_approve_users: "所有新用户需由管理员批准。参阅`must_approve_users`。"
-      invite_only: "所有新用户应该是被邀请的。参阅`invite_only`。"
-      email_auth_res_enqueue: "此电子邮件未通过DMARC检查，很可能不是来自其所声称的来源。检查原始电子邮件的标头以获取更多信息。"
-      email_spam: "该电子邮件被`email_in_spam_header`中定义的标头标记为垃圾邮件。"
-      suspect_user: "这位新用户输入的个人资料信息但没有阅读任何话题或帖子，意味着他可能是垃圾发送者。参见`approve_suspect_users`。"
-      contains_media: "该帖包括嵌入式媒体。参见`review_media_unless_trust_level`。"
-      queued_by_staff: "一名管理员认为该帖子需要审查。在此之前，它将一直保持隐藏状态。"
+      post_count: "每个用户的前几个帖子必须由管理人员审批。请参阅 `approve_post_count`。"
+      trust_level: "信任级别低的用户的回复必须由管理人员审批。请参阅 `approve_unless_trust_level`。"
+      new_topics_unless_trust_level: "信任级别低的用户的话题必须由管理人员审批。请参阅 `approve_new_topics_unless_trust_level`。"
+      fast_typer: "新用户输入第一个帖子的速度快得可疑，怀疑是机器人或垃圾信息发布者所为。请参阅 `min_firse_post_typing_time`。"
+      auto_silence_regexp: "首个帖子符合 `auto_silence_first_post_regex` 设置的新用户。"
+      watched_word: "此帖子包含关注词，请参见您的<a href='%{base_url}/admin/customize/watched_words'>关注词列表</a>。"
+      staged: "暂存用户的新话题和帖子必须由管理人员审批。请参阅 `approve_unless_staged`。"
+      category: "此类别中的帖子要求管理人员手动审批。请参阅类别设置。"
+      must_approve_users: "所有新用户都必须由管理人员审批。请参阅 `must_approve_users`。"
+      invite_only: "所有新用户都应是受到邀请的用户。请参阅 `invite_only`。"
+      email_auth_res_enqueue: "此电子邮件未通过 DMARC 检查，它很可能不是来自表面看起来的人。检查原始电子邮件标头以获取更多信息。"
+      email_spam: "此电子邮件因 `email_in_spam_header` 中定义的标头被标记为垃圾邮件。"
+      suspect_user: "此新用户在没有阅读任何话题或帖子的情况下输入了个人资料信息，这强烈表明他们可能是垃圾信息发布者。请参阅 `approve_suspect_users`。"
+      contains_media: "此帖子包括嵌入式媒体。请参阅 `review_media_unless_trust_level`。"
+      queued_by_staff: "一名管理人员认为此帖子需要审核。在此之前，它将保持隐藏。"
     actions:
       agree:
-        title: "同意......"
+        title: "同意…"
       agree_and_keep:
-        title: "保持帖子"
-        description: "确认标记并保持帖子不变。"
+        title: "保留帖子"
+        description: "同意举报并保持帖子不变。"
       agree_and_keep_hidden:
-        title: "持续隐藏帖子"
-        description: "确认标记并隐藏帖子。"
+        title: "保持帖子隐藏"
+        description: "同意举报并保持帖子隐藏。"
       agree_and_suspend:
         title: "封禁用户"
-        description: "同意标记并暂停用户。"
+        description: "同意举报并封禁用户。"
       agree_and_silence:
         title: "禁言用户"
-        description: "同意标记并禁言用户。"
+        description: "同意举报并禁言用户。"
       agree_and_restore:
         title: "恢复帖子"
-        description: "恢复帖子为所有用户可见。"
+        description: "恢复帖子，以便所有用户都可以看到它。"
       agree_and_hide:
         title: "隐藏帖子"
-        description: "隐藏帖子并自动发送私信给作者使其修改"
+        description: "隐藏此帖子并自动向用户发送一条消息，敦促他们进行编辑。"
       delete_single:
         title: "删除"
       delete:
-        title: "删除......"
+        title: "删除…"
       delete_and_ignore:
         title: "删除帖子并忽视"
-        description: "删除此帖；如果这是这个话题内的第一篇帖子则删除话题"
+        description: "删除帖子；如果是第一个帖子，同时删除话题"
       delete_and_ignore_replies:
-        title: "删除帖子和回复并忽视"
-        description: "删除帖子和其所有的回复；如果是第一个帖子则删除整个话题。"
-        confirm: "您确定要删除帖子的这个回复吗"
+        title: "删除帖子 + 回复并忽略"
+        description: "删除帖子及其所有回复；如果是第一个帖子，同时删除话题"
+        confirm: "确定要同时删除对帖子的回复吗？"
       delete_and_agree:
         title: "删除帖子并同意"
-        description: "删除此帖；如果这是这个话题内的第一篇帖子则删除话题"
+        description: "删除帖子；如果是第一个帖子，同时删除话题"
       delete_and_agree_replies:
-        title: "删除帖子+回复并同意"
-        description: "删除帖子和其所有的回复；如果是第一个帖子则删除整个话题。"
-        confirm: "您确定要删除帖子的这个回复吗"
+        title: "删除帖子 + 回复并同意"
+        description: "删除帖子及其所有回复；如果是第一个帖子，同时删除话题"
+        confirm: "确定要同时删除对帖子的回复吗？"
       disagree_and_restore:
         title: "不同意并恢复帖子"
-        description: "恢复帖子为所有用户可见。"
+        description: "恢复帖子，以便所有用户都可以看到它。"
       disagree:
-        title: "否决"
+        title: "不同意"
       ignore:
         title: "忽略"
       approve:
         title: "批准"
       approve_post:
         title: "批准帖子"
-        confirm_closed: "此话题已关闭。您真的要创建帖子吗？"
+        confirm_closed: "此话题已被关闭。仍要创建帖子吗？"
       reject_post:
-        title: "否决帖子"
+        title: "拒绝帖子"
       approve_user:
         title: "批准用户"
       reject_user:
-        title: "删除用户..."
+        title: "删除用户…"
         delete:
           title: "删除用户"
-          description: "该用户将会被删除。"
+          description: "该用户将被从论坛中删除。"
         block:
-          title: "删除并屏蔽用户"
-          description: "这名用户将会被删除，我们会屏蔽其IP和电子邮件地址。"
+          title: "删除并阻止用户"
+          description: "该用户将被删除，我们将屏蔽他们的 IP 和电子邮件地址。"
       reject:
-        title: "否决"
-        bundle_title: "拒绝..."
+        title: "拒绝"
+        bundle_title: "拒绝…"
       reject_and_suspend:
-        title: "拒绝并暂停用户"
+        title: "拒绝并封禁用户"
       reject_and_silence:
         title: "拒绝并禁言用户"
       reject_and_delete:
@@ -4340,29 +4506,29 @@ zh_CN:
       approve_and_restore:
         title: "批准并恢复帖子"
       delete_user:
-        reason: "通过审核队列删除的"
+        reason: "已通过审核队列删除"
   email_style:
-    html_missing_placeholder: "HTML模板必须包含%{placeholder}"
+    html_missing_placeholder: "HTML 模板必须包含 %{placeholder}"
   notification_level:
-    ignore_error: "对不起，您不能忽略这个用户。"
-    mute_error: "对不起，您不能禁音这个用户。"
+    ignore_error: "抱歉，您不能忽略该用户。"
+    mute_error: "抱歉，您无法将该用户设为免打扰。"
   discord:
-    not_in_allowed_guild: "验证失败。您不是允许的Discord公会的成员。"
+    not_in_allowed_guild: "身份验证失败。您不是允许的 Discord 公会的成员。"
   old_keys_reminder:
-    title: "关于旧凭证的提醒"
+    title: "关于旧凭据的提醒"
     body: |
-      Hello！这是您的 Discourse 实例每年例行安全提醒。
+      您好！这是来自您的 Discourse 实例的例行年度安全提醒。
 
-      出于礼貌，我们想让您知道，您的 Discourse 实例上使用的以下凭证已经两年多没有更新了。
+      为了方便您，我们旨在通知您，在您的 Discourse 实例上使用的以下凭据已超过两年未更新：
 
       %{keys}
 
-      目前不需要采取任何行动，但是，每隔几年对所有重要凭证进行周期性更新是一种良好的安全做法。
+      目前无需采取任何操作，但是，每几年循环一次您的所有重要凭据不失为一种良好的安全做法。
   create_linked_topic:
     topic_title_with_sequence:
-      other: "%{topic_title} (第 %{count} 部分)"
-    post_raw: "延续 %{parent_url} 的讨论。\n\n之前的讨论：\n\n%{previous_topics}"
-    small_action_post_raw: "在 %{new_title} 继续讨论。"
+      other: "%{topic_title}（第 %{count} 部分）"
+    post_raw: "从%{parent_url}继续讨论。\n\n以前的讨论：\n\n%{previous_topics}"
+    small_action_post_raw: "在%{new_title}继续讨论。"
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index 8347e57f13..141669444a 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -1648,7 +1648,6 @@ zh_TW:
     no_email: "沒有 email 被提供，請聯繫網站的管理員。"
     email_error: "無法使用此郵件地址：<b>%{email}</b>註冊帳號，請聯絡此網站管理員"
   original_poster: "原始作者"
-  most_posts: "大部分貼文"
   most_recent_poster: "當前大部分貼文作者"
   frequent_poster: "頻繁發文者"
   redirected_to_top_reasons:
@@ -2481,9 +2480,15 @@ zh_TW:
     account_suspended:
       title: "帳號被停權"
       subject_template: "[%{email_prefix}] 你的帳號已被停權"
+    account_suspended_forever:
+      title: "帳號被停權"
+      subject_template: "[%{email_prefix}] 你的帳號已被停權"
     account_silenced:
       title: "帳號被禁言"
       subject_template: "[%{email_prefix}] 你的帳號已被禁言"
+    account_silenced_forever:
+      title: "帳號被禁言"
+      subject_template: "[%{email_prefix}] 你的帳號已被禁言"
     account_exists:
       title: "帳號已存在"
       subject_template: "[%{email_prefix}] 帳號已存在"
diff --git a/plugins/discourse-details/config/locales/client.pt_BR.yml b/plugins/discourse-details/config/locales/client.pt_BR.yml
index 3c55478edb..9ebd0c1c7a 100644
--- a/plugins/discourse-details/config/locales/client.pt_BR.yml
+++ b/plugins/discourse-details/config/locales/client.pt_BR.yml
@@ -7,7 +7,7 @@
 pt_BR:
   js:
     details:
-      title: Ocultar Detalhes
+      title: Ocultar detalhes
     composer:
       details_title: Resumo
       details_text: "Este texto ficará oculto."
diff --git a/plugins/discourse-details/config/locales/server.bg.yml b/plugins/discourse-details/config/locales/server.bg.yml
index 52333529d3..52d8750a55 100644
--- a/plugins/discourse-details/config/locales/server.bg.yml
+++ b/plugins/discourse-details/config/locales/server.bg.yml
@@ -5,3 +5,7 @@
 # https://translate.discourse.org/
 
 bg:
+  site_settings:
+    details_enabled: 'Включете възможността за добавяне на разширяващи се подробности към публикация. Тази функция може да бъде намерена в изскачащото меню на лентата с инструменти на текстовия редактор. Трябва да промените всички публикации с "rake posts:rebake", ако промените тази настройка.'
+  details:
+    excerpt_details: "(щракнете за повече подробности)"
diff --git a/plugins/discourse-details/config/locales/server.it.yml b/plugins/discourse-details/config/locales/server.it.yml
index b02f225c2c..6267d58a13 100644
--- a/plugins/discourse-details/config/locales/server.it.yml
+++ b/plugins/discourse-details/config/locales/server.it.yml
@@ -5,5 +5,7 @@
 # https://translate.discourse.org/
 
 it:
+  site_settings:
+    details_enabled: 'Includi la possibilità di aggiungere dettagli espandibili a un messaggio. Questa funzione può essere trovata nel menu a comparsa della barra degli strumenti del composer. Se modifichi questa impostazione, devi aggiornare tutti i messaggi con il comando "rake posts:rebake".'
   details:
     excerpt_details: "(clicca per ulteriori dettagli)"
diff --git a/plugins/discourse-details/config/locales/server.ja.yml b/plugins/discourse-details/config/locales/server.ja.yml
index af9085daba..7a3846774f 100644
--- a/plugins/discourse-details/config/locales/server.ja.yml
+++ b/plugins/discourse-details/config/locales/server.ja.yml
@@ -6,6 +6,6 @@
 
 ja:
   site_settings:
-    details_enabled: '投稿に拡張可能な詳細を追加する機能を含めます。この機能はコンポーザーのツールバーポップアップメニューにあります。この設定を変更する場合、「rake posts:rebake」を使用してすべての投稿を作成し直す必要があります。'
+    details_enabled: '投稿に拡張可能な詳細を追加する機能を含めます。この機能はコンポーザーのツールバーポップアップメニューにあります。この設定を変更する場合、"rake posts:rebake" を使用してすべての投稿を作成し直す必要があります。'
   details:
     excerpt_details: "(クリックして詳細を表示)"
diff --git a/plugins/discourse-details/config/locales/server.zh_CN.yml b/plugins/discourse-details/config/locales/server.zh_CN.yml
index 4656ffc522..9127942e78 100644
--- a/plugins/discourse-details/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-details/config/locales/server.zh_CN.yml
@@ -6,6 +6,6 @@
 
 zh_CN:
   site_settings:
-    details_enabled: '为帖子启用“添加可展开的详细信息”功能。此功能可在编辑器的工具栏弹出菜单中找到。如果你修改了这个设置，你必须使用“rake posts:rebake”重制所有帖子。'
+    details_enabled: '包括向帖子添加可扩展详细信息的功能。此功能可以在编辑器的工具栏弹出菜单中找到。如果您更改此设置，则必须使用 "rake posts:rebake" 重新发布所有帖子。'
   details:
-    excerpt_details: "（点击显示详情）"
+    excerpt_details: "（点击了解更多详细信息）"
diff --git a/plugins/discourse-local-dates/config/locales/client.ar.yml b/plugins/discourse-local-dates/config/locales/client.ar.yml
index 819a09a1cd..cb7acc95c3 100644
--- a/plugins/discourse-local-dates/config/locales/client.ar.yml
+++ b/plugins/discourse-local-dates/config/locales/client.ar.yml
@@ -20,7 +20,7 @@ ar:
           format_description: "التنسيق المستخدم لعرض التاريخ للمستخدم. استخدم Z لعرض الإزاحة وzz لاسم المنطقة الزمنية."
           timezones_title: المناطق الزمنية لعرضها
           recurring_title: التكرار
-          recurring_description: "حدِّد تكرار الحدث. يمكنك أيضًا تعديل خيار التكرار الذي أنشأه النموذج يدويًا واستخدام أحد المفاتيح التالية: years، ‏quarters، ‏months، ‏days، ‏hours، ‏minutes، ‏seconds، ‏milliseconds."
+          recurring_description: "حدِّد مدى تكرار الحدث. يمكنك أيضًا تعديل خيار التكرار الذي أنشأه النموذج يدويًا واستخدام أحد المفاتيح التالية: years، ‏quarters، ‏months، ‏days، ‏hours، ‏minutes، ‏seconds، ‏milliseconds."
           recurring_none: بلا تكرار
           invalid_date: التاريخ غير صالح، تأكَّد من صحة التاريخ والوقت
           date_title: التاريخ
diff --git a/plugins/discourse-local-dates/config/locales/client.pt_BR.yml b/plugins/discourse-local-dates/config/locales/client.pt_BR.yml
index a77a5edce2..49845ff8b7 100644
--- a/plugins/discourse-local-dates/config/locales/client.pt_BR.yml
+++ b/plugins/discourse-local-dates/config/locales/client.pt_BR.yml
@@ -12,30 +12,31 @@ pt_BR:
         tomorrow: Amanhã %{time}
         yesterday: Ontem %{time}
         countdown:
-          passed: data já passou
-      title: Inserir data / hora
+          passed: a data já passou
+      title: Inserir data/hora
       create:
         form:
           insert: Inserir
           advanced_mode: Modo avançado
           simple_mode: Modo simples
+          format_description: "Formato usado para exibir a dada ao(à) usuário(a). Use Z para exibir o resultado e zz para o nome do fuso horário."
           timezones_title: Fusos horários para exibir
           timezones_description: Os fusos horários serão usados ​​para exibir datas na pré-visualização e no fallback.
           recurring_title: Recorrência
           recurring_description: "Defina a recorrência de um evento. Você também pode editar manualmente a opção recorrente gerada pelo formulário e usar uma das seguintes chaves em inglês: years, quarters, months, weeks, days, hours, minutes, seconds, milliseconds."
           recurring_none: Sem recorrência
-          invalid_date: Data inválida, certifique-se de que a data e a hora estão corretas
+          invalid_date: Data inválida, verifique se a data e a hora estão corretas
           date_title: Data
           time_title: Hora
           format_title: Formato de data
-          timezone: Fuso Horário
+          timezone: Fuso horário
           until: Até…
           recurring:
-            every_day: "Diariamente"
-            every_week: "Semanalmente"
-            every_two_weeks: "Quinzenalmente"
-            every_month: "Mensalmente"
-            every_two_months: "Bimestralmente"
-            every_three_months: "Trimestralmente"
-            every_six_months: "Semestralmente"
-            every_year: "Anualmente"
+            every_day: "Todos os dias"
+            every_week: "Todas as semanas"
+            every_two_weeks: "A cada duas semanas"
+            every_month: "A cada mês"
+            every_two_months: "A cada dois meses"
+            every_three_months: "A cada tres meses"
+            every_six_months: "A cada seis meses"
+            every_year: "Todos os anos"
diff --git a/plugins/discourse-local-dates/config/locales/client.zh_CN.yml b/plugins/discourse-local-dates/config/locales/client.zh_CN.yml
index 95953c19b9..df7ca0ee68 100644
--- a/plugins/discourse-local-dates/config/locales/client.zh_CN.yml
+++ b/plugins/discourse-local-dates/config/locales/client.zh_CN.yml
@@ -19,18 +19,18 @@ zh_CN:
           insert: 插入
           advanced_mode: 高级模式
           simple_mode: 简单模式
-          format_description: "用于向用户显示的日期格式。使用Z显示时区的偏移量，使用zz显示时区的名称。"
+          format_description: "用于向用户显示日期的格式。使用 Z 显示偏移，使用 zz 显示时区名称。"
           timezones_title: 要显示的时区
-          timezones_description: 时区将用于在预览和撤回中显示日期。
-          recurring_title: 循环
-          recurring_description: "定义重复事件。你还可以使用以下关键字之一手动编辑表单生成的周期性选项：年，季，月，周，日，时，分，秒，毫秒。"
-          recurring_none: 没有循环
-          invalid_date: 日期无效，请确保日期和时间是正确的
+          timezones_description: 时区将用于在预览和回退中显示日期。
+          recurring_title: 重复
+          recurring_description: "定义事件的重复发生。您还可以手动编辑表单生成的重复选项并使用以下键之一：年、季度、月、周、日、小时、分钟、秒、毫秒。"
+          recurring_none: 不重复
+          invalid_date: 日期无效，请确保日期和时间正确
           date_title: 日期
           time_title: 时间
           format_title: 日期格式
           timezone: 时区
-          until: 直到......
+          until: 直到…
           recurring:
             every_day: "每天"
             every_week: "每周"
diff --git a/plugins/discourse-local-dates/config/locales/server.ja.yml b/plugins/discourse-local-dates/config/locales/server.ja.yml
index 54d2d88ebc..6197c6557e 100644
--- a/plugins/discourse-local-dates/config/locales/server.ja.yml
+++ b/plugins/discourse-local-dates/config/locales/server.ja.yml
@@ -7,6 +7,6 @@
 ja:
   site_settings:
     discourse_local_dates_enabled: "discourse-local-dates 機能を有効にします。これにより、[date] 要素を使用した投稿で現地タイムゾーンに対応した日付がサポートされます。"
-    discourse_local_dates_default_formats: "よく使用される日付時刻フォーマット。<a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs 文字列フォーマット</a>をご覧ください。"
+    discourse_local_dates_default_formats: "よく使用される日付時刻フォーマット。「<a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs 文字列フォーマット</a>」をご覧ください。"
     discourse_local_dates_default_timezones: "デフォルトのタイムゾーンのリスト。有効な <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a> である必要があります"
     discourse_local_dates_email_format: "メールに日付を表示するために使用されるフォーマット。"
diff --git a/plugins/discourse-local-dates/config/locales/server.pt_BR.yml b/plugins/discourse-local-dates/config/locales/server.pt_BR.yml
index d2377cedbe..673cfda0cd 100644
--- a/plugins/discourse-local-dates/config/locales/server.pt_BR.yml
+++ b/plugins/discourse-local-dates/config/locales/server.pt_BR.yml
@@ -6,7 +6,7 @@
 
 pt_BR:
   site_settings:
-    discourse_local_dates_enabled: "Habilitar o recurso discourse-local-dates. Isto adicionará suporte às datas de fuso horário local em postagens usando o elemento [date]."
-    discourse_local_dates_default_formats: "Formatos de data e hora usados ​​com frequência, veja: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs string format</a>"
-    discourse_local_dates_default_timezones: "Lista padrão de fusos horários, precisa ser uma válida<a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a>"
+    discourse_local_dates_enabled: "Ative o recurso discourse-local-dates. Isso adicionará suporte para datas com reconhecimento de fuso horário local nas postagens com o elemento [date]."
+    discourse_local_dates_default_formats: "Formatos de data e hora usados ​​com frequência, acsse: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>formato de linha moment.js</a>"
+    discourse_local_dates_default_timezones: "Lista padrão de fusos horários, precisa ser um <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>fuso horário</a> válido"
     discourse_local_dates_email_format: "Formato usado para exibir a data em e-mails."
diff --git a/plugins/discourse-local-dates/config/locales/server.zh_CN.yml b/plugins/discourse-local-dates/config/locales/server.zh_CN.yml
index 0e639b2b72..34be8aaed2 100644
--- a/plugins/discourse-local-dates/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-local-dates/config/locales/server.zh_CN.yml
@@ -6,7 +6,7 @@
 
 zh_CN:
   site_settings:
-    discourse_local_dates_enabled: "启用discourse-local-dates功能。这将在使用[date]元素的帖子中添加对本地时区感知日期的支持。"
-    discourse_local_dates_default_formats: "经常使用的日期时间格式，请参阅：<a target='_blank' rel='noopener'href='https://momentjs.com/docs/#/parsing/string-format/'> momentjs字符串格式</a>"
-    discourse_local_dates_default_timezones: "默认的时区列表，必须是有效的<a target='_blank' rel='noopener'href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a>"
-    discourse_local_dates_email_format: "用于在电子邮件中显示的日期格式。"
+    discourse_local_dates_enabled: "启用 discourse-local-dates 功能。这将使用 [date]元素在帖子中添加对本地时区感知日期的支持。"
+    discourse_local_dates_default_formats: "常用的日期时间格式，请参阅：<a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs 字符串格式</a>"
+    discourse_local_dates_default_timezones: "时区的默认列表，必须是有效的 <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a>"
+    discourse_local_dates_email_format: "用于在电子邮件中显示日期的格式。"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.pt_BR.yml b/plugins/discourse-narrative-bot/config/locales/client.pt_BR.yml
index b8b2cc04ff..9fc28cc603 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.pt_BR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.pt_BR.yml
@@ -8,5 +8,5 @@ pt_BR:
   js:
     discourse_narrative_bot:
       welcome_post_type:
-        new_user_track: "Iniciar o tutorial de novo usuário para todos os usuários novos"
-        welcome_message: "Enviar uma mensagem de boas vindas com um guia de início rápido para todos os usuários novos"
+        new_user_track: "Iniciar o tutorial de novo(a) usuário(a) para todos(as) os(as) usuários(as) novos(as)"
+        welcome_message: "Enviar uma mensagem de boas-vindas com um guia de início rápido para todos os(as) usuários(as) novos(as)"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.zh_CN.yml b/plugins/discourse-narrative-bot/config/locales/client.zh_CN.yml
index ae6cf92456..b712f0b86d 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.zh_CN.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.zh_CN.yml
@@ -8,5 +8,5 @@ zh_CN:
   js:
     discourse_narrative_bot:
       welcome_post_type:
-        new_user_track: "给所有新用户启动新用户向导"
-        welcome_message: "给所有新用户发送快速开始指南，作为欢迎消息"
+        new_user_track: "为所有新用户启动新用户教程"
+        welcome_message: "向所有新用户发送带有快速入门指南的欢迎消息。"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ar.yml b/plugins/discourse-narrative-bot/config/locales/server.ar.yml
index ed896610aa..852ecc77cd 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ar.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ar.yml
@@ -7,9 +7,9 @@
 ar:
   site_settings:
     discourse_narrative_bot_enabled: "تفعيل Discourse Narrative Bot (discobot)"
-    disable_discourse_narrative_bot_welcome_post: "تعطيل مشاركة المنشور الترحيبي من Discourse Narrative Bot"
+    disable_discourse_narrative_bot_welcome_post: "إيقاف مشاركة المنشور الترحيبي من Discourse Narrative Bot"
     discourse_narrative_bot_ignored_usernames: "أسماء المستخدمين المفترض أن يتجاهلها Discourse Narrative Bot"
-    discourse_narrative_bot_disable_public_replies: "تعطيل الردود العامة من Discourse Narrative Bot"
+    discourse_narrative_bot_disable_public_replies: "إيقاف الردود العامة من Discourse Narrative Bot"
     discourse_narrative_bot_welcome_post_type: "نوع المنشور الترحيبي المفترض أن يُرسله Discourse Narrative Bot"
     discourse_narrative_bot_welcome_post_delay: "انتظر (ن) ثانية قبل إرسال المنشور الترحيبي من Discourse Narrative Bot."
   badges:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.it.yml b/plugins/discourse-narrative-bot/config/locales/server.it.yml
index a6e15af6f7..34c0491ef3 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.it.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.it.yml
@@ -25,6 +25,7 @@ it:
       long_description: |
         Questo distintivo è assegnato al completamento del tutorial interattivo per utenti avanzati. Hai imparato gli strumenti avanzati di discussione — e ora sei un diplomato!
   discourse_narrative_bot:
+    bio: "Ciao, non sono una persona reale. Sono un bot che ti può insegnare a usare questo sito. Per interagire con me inviami un messaggio o menzionami per nome."
     tl2_promotion_message:
       subject_template: "Ora che sei stato promosso, è il momento di conoscere alcune funzionalità avanzate!"
       text_body_template: |
@@ -98,7 +99,7 @@ it:
         "8": "Le prospettive sono buone"
         "9": "Sì"
         "10": "I segni indicano di sì"
-        "11": "E' difficile rispondere, prova di nuovo"
+        "11": "Risposta confusa, prova di nuovo"
         "12": "Rifai la domanda più tardi"
         "13": "Meglio non risponderti adesso"
         "14": "Ora non lo posso prevedere"
@@ -131,6 +132,7 @@ it:
 
           `@%{discobot_username} %{magic_8_ball_trigger}`
           > :crystal_ball: Ci puoi contare
+        discobot_disabled: Mi hai disabilitato nelle tue preferenze. Devi attivare i suggerimenti per l'onboarding dei nuovi utenti per interagire con me.
       do_not_understand:
         first_response: |-
           Ciao, grazie per la risposta!
@@ -190,7 +192,7 @@ it:
         not_found: |-
           Sembra che tu non abbia caricato un'immagine così ho scelto una foto che sono _sicuro_ ti piacerà.
 
-          `%{image_url}`
+          <%{image_url}>
 
           Prova a caricare questa nel prossimo messaggio, o incolla il link su una riga da sola!
       likes:
@@ -274,6 +276,12 @@ it:
 
           (E sì, il mio username inizia con _disco_, come ai tempi della dance mania degli anni 70. Io [amo la vita notturna!](https://www.youtube.com/watch?v=B_wGI3_sGf8) :dancer:)
       flag:
+        instructions: |-
+          Ci piacciono le nostre discussioni amichevoli e abbiamo bisogno del tuo aiuto per [mantenere questo forum un posto civile](%{guidelines_url}). Se riscontri un problema, segnalalo per farlo sapere in privato all'autore o al [nostro staff](%{about_url}). Ci sono molte ragioni per cui potresti decidere di segnalare un messaggio, che vanno da un semplice suggerimento di suddivisione degli argomenti, fino alle più serie segnalazioni di evidenti violazioni degli standard della comunità. Se selezioni **Qualcos'altro**, avvierai una discussione con messaggi privati con i moderatori dove potrai porre ulteriori domande.
+
+          > :imp: Ho scritto qualcosa di brutto qui
+
+          Vai avanti e **segnala questo post** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> e seleziona **Contenuto inappropriato** come motivo!
         reply: |-
           [Il nostro staff](%{base_uri}/groups/staff) verrà notificato privatamente della tua segnalazione. Se abbastanza membri della comunità segnalano un messaggio, quest'ultimo verrà automaticamente nascosto per precauzione. (Dal momento che non ho scritto veramente qualcosa di brutto :angel:, ho rimosso la segnalazione per ora.)
         not_found: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ja.yml b/plugins/discourse-narrative-bot/config/locales/server.ja.yml
index 0302576ea8..f0314e4c26 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ja.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ja.yml
@@ -168,7 +168,7 @@ ja:
           <https://en.wikipedia.org/wiki/Death_by_coconut>
           <https://en.wikipedia.org/wiki/Calculator_spelling>
         reply: |-
-          うまくいきましたね！この方法は、ほとんどの <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> リンクでし応できます。_リンクだけ_を 1 行に入力し、前後にリンクに含まれない文字などを含めないようにしましょう。
+          うまくいきましたね！この方法は、ほとんどの <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> リンクで使用できます。_リンクだけ_を 1 行に入力し、前後にリンクに含まれない文字などを含めないようにしましょう。
         not_found: |-
           残念ですが、返信にリンクが見つかりませんでした！:cry:
 
@@ -181,7 +181,7 @@ ja:
 
           <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
 
-          これが気に入ったら（気に入らないわけないですよね！）、この投稿の下にある「いいね！」:heart: ボタンを押して気に入ったことを教えてください。
+          これが気に入ったら (気に入らないわけないですよね！)、この投稿の下にある「いいね！」:heart: ボタンを押して気に入ったことを教えてください。
 
           **画像付きで返信**できますか？どんな画像でもかまいません！画像をドラッグアンドドロップしてアップロードボタンを押すか、コピーして貼り付けるだけでもアップロードできます。
         reply: |-
@@ -200,7 +200,7 @@ ja:
 
           <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
 
-          これが気に入ったら（気に入らないわけないですよね！）、この投稿の下にある「いいね！」:heart: ボタンを押して気に入ったことを教えてください。
+          これが気に入ったら (気に入らないわけないですよね！)、この投稿の下にある「いいね！」:heart: ボタンを押して気に入ったことを教えてください。
         reply: |-
           投稿に「いいね！」してくれてありがとう！
         not_found: |-
@@ -246,7 +246,7 @@ ja:
           あれ？このトピックにはブックマークがありませんね。投稿の下にあるブックマークを見つけられましたか？必要であれば、もっと表示 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> を使うと、ほかの操作を表示できます。
       emoji:
         instructions: |-
-          返信に小さな画像を使用していたのに気づきましたか？:blue_car: これらは[emoji](https://en.wikipedia.org/wiki/Emoji)と呼ばれています。次のいずれかの方法で、返信に**絵文字を追加**してみましょう。
+          返信に小さな画像を使用していたのに気づきましたか？:blue_car::dash: これらは[emoji](https://en.wikipedia.org/wiki/Emoji)と呼ばれています。次のいずれかの方法で、返信に**絵文字を追加**してみましょう。
 
           - `:) ;) :D :P :O` と入力します。
 
@@ -261,6 +261,8 @@ ja:
           コロン <kbd>:</kbd> を入力すると、絵文字ピッカーが表示されるので、`:bird:` のような語の最初の数文字を入力してください。
 
           または、エディターの絵文字ボタン <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> も使用できます。
+
+          (モバイルデバイスを使用している場合は、キーボードから直接絵文字を入力することもできます。)
       mention:
         instructions: |-
           直接返信せずに誰かの注意を引きたいことがあるかもしれません。`@` を入力してから相手のユーザー名を入力すると、メンションすることができます。
@@ -281,7 +283,7 @@ ja:
 
           早速**この投稿を通報** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> して、理由に「**不適切**」を選択しましょう！
         reply: |-
-          この通報は[スタッフ](%{base_uri}/groups/staff)に非公開で通知されます。十分な数のコミュニティメンバーからこの投稿への通報が寄せられた場合は、予防措置として自動的に非表示になります。(実際には、不愉快な内容は書き込まなかった :angel: ので、この通報は取り消しておきました。）
+          この通報は[スタッフ](%{base_uri}/groups/staff)に非公開で通知されます。十分な数のコミュニティメンバーからこの投稿への通報が寄せられた場合は、予防措置として自動的に非表示になります。(実際には、不愉快な内容は書き込まなかった :angel: ので、この通報は取り消しておきました。)
         not_found: |-
           おや？私の不愉快な投稿はまだ不適切の通報を受けていないようです。:worried: **通報** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> を使って投稿を不適切だと通報してみてください。投稿の操作をさらに表示するには、もっと表示ボタン <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> を使用してくださいね。
       search:
@@ -369,18 +371,18 @@ ja:
         not_found: |-
           あれ？どこにもカテゴリが見当たりません。`#` を最初の文字として使用することはできません。次の返信に、これをコピーしてみてください。
 
-          ```テキスト
+          ```text
           # を使ってカテゴリリンクを作成できます
           ```
         reply: |-
           お見事！これはカテゴリだけでなく、_さらに_タグが有効になっている場合にはタグでも動作します。
       change_topic_notification_level:
         instructions: |-
-          すべてのトピックに通知レベルがあります。誰かがあなたに直接話しかけている場合にのみ通知される「通常」で始まります。
+          すべてのトピックに通知レベルがあります。誰かがあなたに直接話しかけている場合にのみ通知される '通常' で始まります。
 
           デフォルトでは、非公開メッセージの通知レベルは最高レベルの 'ウォッチ中' に設定されています。この設定では、新しい返信があるたびに通知が届きます。ただし、トピックの通知レベルを 'ウォッチ'、'追跡'、または 'ミュート' にオーバーライドすることができます。
 
-          このトピックの通知レベルを変更してみましょう。トピックの一番下に、このトピックを **ウォッチ中** と示されています。この通知レベルを **追跡** に変更できますか？
+          このトピックの通知レベルを変更してみましょう。トピックの一番下に、このトピックを**ウォッチ中**と示されています。この通知レベルを**追跡**に変更できますか？
         not_found: |-
           まだこのトピックをウォッチ中 :eyes: のようです！設定の場所がわかりませんか？通知レベルボタンは、トピックの一番下にあります。
         reply: |-
@@ -395,7 +397,7 @@ ja:
 
           エディタの <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> 歯車アイコンを使うか、この投票をコピーして、次の返信に貼り付けてください。
 
-          ```テキスト
+          ```text
           [poll]
           * :cat:
           * :dog:
@@ -432,7 +434,7 @@ ja:
           [/details]
           ```
         reply: |-
-          上出来です - _細部_ への気配りにあっぱれです！
+          上出来です - _細部_への気配りにあっぱれです！
       end:
         message: |-
           まさに_上級ユーザー_のようにこのチュートリアルを完了しました :bow:
@@ -443,4 +445,4 @@ ja:
 
           それでは今日はこの辺で！また私と話すことがあれば、いつでもメッセージを送ってください :sunglasses:
       certificate:
-        alt: "上級ユーザートラック修了証書"
+        alt: "上級ユーザートラック修了証"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml b/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
index ad725899bf..5ebd1f11c5 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
@@ -280,6 +280,12 @@ pl_PL:
           (Tak, moja nazwa użytkownika pisana jest _disco_, tak jak w popularna w latach 90 muzyka. Naprawdę [kocham życie nocne!]
           (https://www.youtube.com/watch?v=B_wGI3_sGf8) :dancer:)
       flag:
+        instructions: |-
+          Lubimy, gdy nasze dyskusje są przyjazne i potrzebujemy Twojej pomocy, aby [zachować cywilizowane wypowiedzi](%{guidelines_url}). Jeśli zauważysz problem, zgłoś go w prywatnej wiadomości autorowi lub [naszemu pomocnemu personelowi](%{about_url}). Istnieje wiele powodów, dla których chcesz oznaczyć post, począwszy od nieszkodliwej sugestii dotyczącej podziału tematów aż po wyraźne naruszenie standardów społeczności. Jeśli wybierzesz **coś innego**, rozpoczniesz prywatną dyskusję z moderatorami, gdzie możesz zadawać dodatkowe pytania.
+
+          > :imp: napisałem tutaj coś nieprzyjemnego
+
+          Idąc dalej, **oflaguj ten post** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> i wybierz **to niewłaściwe** jako powód!
         reply: |-
           [Nasz zespół](%{base_uri}/groups/staff) zostanie prywatnie poinformowany o Twojej fladze. W przypadku, gdy wystarczająca liczba członków społeczności oflaguje ten sam wpis, zostanie on automatycznie ukryty ze względów ostrożności (Jako żę tak naprawdę nie napisałem niczego nieodpowiedniego :angel:, po prostu usunąłem flagę ze swojego wpisu),
         not_found: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml b/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
index 7daa78c15f..1b808a7740 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
@@ -6,69 +6,71 @@
 
 pt_BR:
   site_settings:
-    discourse_narrative_bot_enabled: "Habilitar Discourse Narrative Bot (discobot)"
-    disable_discourse_narrative_bot_welcome_post: "Desabilitar a postagem de boas vindas do Discourse Narrative Bot"
-    discourse_narrative_bot_ignored_usernames: "Nomes de usuário que o Discourse Narrative Bot deve ignorar"
-    discourse_narrative_bot_disable_public_replies: "Desabilitar respostas públicas do Discourse Narrative Bot"
-    discourse_narrative_bot_welcome_post_type: "Tipo de postagem de boas vindas que o Discourse Narrative Bot deve enviar"
-    discourse_narrative_bot_welcome_post_delay: "Espere (n) segundos antes de enviar a postagem de boas vindas do Discourse Narrative Bot."
+    discourse_narrative_bot_enabled: "Ativar o robô de narração do Discourse (discobot)"
+    disable_discourse_narrative_bot_welcome_post: "Desativar postagem de boas-vindas do robô de narração do Discourse"
+    discourse_narrative_bot_ignored_usernames: "Nomes de usuário(a) que o robô de narração do Discourse deve ignorar"
+    discourse_narrative_bot_disable_public_replies: "Desativar respostas públicas do robô de narração do Discourse"
+    discourse_narrative_bot_welcome_post_type: "Tipo de postagem de boas-vindas que o robô de narração do Discourse deve enviar"
+    discourse_narrative_bot_welcome_post_delay: "Espere (n) segundos antes de enviar a postagem de boas-vindas do robô de narração do Discourse."
+    discourse_narrative_bot_skip_tutorials: "Tutoriais do Discourse Narrative Bot para pular"
   badges:
     certified:
-      name: Certificado
-      description: "Completou o nosso tutorial de novo usuário"
+      name: Certificado(a)
+      description: "Concluiu o nosso tutorial de novo(a) usuário(a)"
       long_description: |
-        Este emblema é concedido após a conclusão bem-sucedida do tutorial interativo de novo usuário. Você tomou a iniciativa de aprender as ferramentas básicas de discussão, e agora você está certificado!
+        Este emblema é concedido após a conclusão do tutorial interativo de novo(a) usuário(a). Você tomou a iniciativa de aprender as ferramentas básicas de discussão e obteve uma certificação!
     licensed:
-      name: Licenciado
-      description: "Completou nosso tutorial de usuário avançado"
+      name: Licenciado(a)
+      description: "Concluiu nosso tutorial de usuário(a) avançado(a)"
       long_description: |
-        Este emblema é concedido após a conclusão bem-sucedida do tutorial interativo de usuário avançado. Você dominou as ferramentas avançadas de discussão — e agora está totalmente licenciado!
+        Este emblema é concedido após a conclusão do tutorial interativo de usuário(a) avançado(a). Você dominou as ferramentas avançadas de discussão e agora está totalmente licenciado(a)!
   discourse_narrative_bot:
+    bio: "Oi, eu não sou uma pessoa real. Eu sou um robô que pode ensinar como usar este site. Para interagir comigo, envie uma mensagem ou mencione **`@`** em qualquer lugar."
     tl2_promotion_message:
-      subject_template: "Agora que você foi promovido, é hora de aprender sobre alguns recursos avançados!"
+      subject_template: "Agora que você foi promovido(a), é hora de aprender alguns recursos avançados!"
       text_body_template: |
-        Responda a esta mensagem com `@%{discobot_username} %{reset_trigger}` para saber mais sobre o que você pode fazer.
+        Responda a esta mensagem com "@%{discobot_username} %{reset_trigger}" para saber mais sobre o que você pode fazer.
     timeout:
       message: |-
-        Oi @%{username}, só estou checando para ver se está tudo bem porque não tenho notícias de você já tem um tempo.
+        Oi @%{username}, só estou conferindo se está tudo bem porque não tenho notícias de você já tem um tempo.
 
         - Para continuar, me responda a qualquer momento.
 
-        - Se você quiser pular esta parte, diga `%{skip_trigger}`.
+        - Se você quiser pular esta parte, diga "%{skip_trigger}".
 
-        - Para começar de novo, diga `%{reset_trigger}`.
+        - Para começar de novo, diga "%{reset_trigger}".
 
-        Se você preferir que não, tudo bem também. Eu sou um robô. Você não vai machucar meus sentimentos. :sob:
+        Se você preferir que não, tudo bem. Eu sou um robô. Você não vai ferir meus sentimentos. :sob:
     dice:
       trigger: "rolar"
       invalid: |-
         Sinto muito, é matematicamente impossível rolar essa combinação de dados. :confounded:
       not_enough_dice:
-        one: "Eu só tenho %{count} dado. [Vergonhoso](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), eu sei!"
-        other: "Eu só tenho %{count} dados. [Vergonhoso](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), eu sei!"
+        one: "Eu só tenho %{count} dado. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), eu sei!"
+        other: "Eu só tenho %{count} dados. [Shameful](https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php), eu sei!"
       out_of_range: |-
-        Você sabia que [o número máximo de lados](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) para um dado matematicamente justo é 120?
+        Você sabia que [a quantidade máxima de lados](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) para um dado matematicamente justo é 120?
       results: |-
         > :game_die: %{results}
     quote:
       trigger: "citação"
       "1":
-        quote: "No meio de toda dificuldade reside a oportunidade"
+        quote: "Em toda dificuldade, há uma oportunidade"
         author: "Albert Einstein"
       "2":
-        quote: "A liberdade não vale a pena se não conota liberdade para errar."
+        quote: "A liberdade não vale a pena se não vem acompanhada da liberdade para errar."
         author: "Mahatma Gandhi"
       "3":
         quote: "Não chore por que acabou, sorria porque aconteceu."
-        author: "Dr Seuss"
+        author: "Dr. Seuss"
       "4":
-        quote: "Se você quer que algo seja feito corretamente, faça você mesmo."
+        quote: "Se você quer que algo saia bem-feito, faça você mesmo."
         author: "Charles-Guillaume Étienne"
       "5":
-        quote: "Acredite que você consegue que você estará na metade do caminho."
+        quote: "Acredite que consegue, e você estará na metade do caminho."
         author: "Theodore Roosevelt"
       "6":
-        quote: "A vida é uma caixinha de surpresas. Você nunca sabe o que vai acontecer."
+        quote: "A vida é uma caixinha de surpresas. Você nunca sabe o que vai encontrar."
         author: "Mãe do Forrest Gump"
       "7":
         quote: "Este é um pequeno passo para um homem, mas um grande salto para a humanidade."
@@ -88,39 +90,39 @@ pt_BR:
       trigger: "sorte"
       answers:
         "1": "É certo"
-        "2": "É decididamente assim"
+        "2": "É bem assim"
         "3": "Sem dúvida"
-        "4": "Sim, definitivamente"
-        "5": "Você pode contar com isto"
+        "4": "Sim, com certeza"
+        "5": "Você pode confiar"
         "6": "Ao meu ver, sim"
         "7": "Bem provavelmente"
         "8": "Boa perspectiva"
         "9": "Sim"
-        "10": "Sinais apontam que sim"
-        "11": "Resposta nebulosa, tente novamente"
+        "10": "Sinais indicam que sim"
+        "11": "Resposta confusa, tente novamente"
         "12": "Pergunte novamente depois"
-        "13": "Melhor não falar pra você agora"
+        "13": "Melhor não falar agora"
         "14": "Não é possível prever agora"
         "15": "Concentre-se e pergunte novamente"
         "16": "Não conte com isto"
         "17": "Minha resposta é não"
         "18": "Minhas fontes dizem que não"
-        "19": "Perspectiva não tão boa"
+        "19": "A perspectiva não é tão boa"
         "20": "Muito duvidoso"
       result: |-
         > :crystal_ball: %{result}
     track_selector:
       reset_trigger: "começar"
       skip_trigger: "pular"
-      help_trigger: "mostrar ajuda"
+      help_trigger: "exibir ajuda"
       random_mention:
         reply: |-
-          Oi! Para descobrir o que eu posso fazer diga `@%{discobot_username} %{help_trigger}`.
+          Oi! Para descobrir o que eu posso fazer, diga "@%{discobot_username} %{help_trigger}".
         tracks: |-
-          Eu atualmente sei como fazer as seguintes coisas:
+          Por enquanto, sei fazer isto:
 
           `@%{discobot_username} %{reset_trigger} {name-of-tutorial}`
-          > Inicia um tutorial interativo só para você, em uma mensagem pessoal. `{name-of-tutorial}` pode ser um entre: `%{tracks}`.
+          > Inicia um tutorial interativo só para você, em uma mensagem pessoal. "{name-of-tutorial}` pode ser um entre: `%{tracks}".
         bot_actions: |-
           `@%{discobot_username} %{dice_trigger} 2d6`
           > :game_die: 3, 6
@@ -129,36 +131,37 @@ pt_BR:
           %{quote_sample}
 
           `@%{discobot_username}%{magic_8_ball_trigger}`
-          > :crystal_ball: Você pode contar com ele
+          > :crystal_ball: Você pode confiar
+        discobot_disabled: Você me desativou nas suas preferências. Você precisa permitir dicas de integração de novo(a) usuário(a) para interagir comigo.
       do_not_understand:
         first_response: |-
-          Ei, obrigado pela resposta!
+          Olá, obrigado pela resposta!
 
-          Infelizmente, como um robô mal programado, eu meio que não consigo entender aquela lá. :frowning:
-        track_response: Você pode tentar novamente, ou se quiser pular este passo, diga `%{skip_trigger}`. Ou então, para começar de novo, diga `%{reset_trigger}`.
+          Infelizmente, como um robô mal programado, meio que não consigo entender. :frowning:
+        track_response: Você pode tentar novamente, ou, se quiser pular este passo, diga "%{skip_trigger}". Ou então, para começar de novo, diga "%{reset_trigger}".
         second_response: |-
-          Aaah, desculpa. Mas eu ainda não estou entendendo. :anguished:
+          Aaah, desculpa. Mas ainda não estou entendendo. :anguished:
 
-          Eu sou apenas um robô, mas se você quiser falar com uma pessoal real, veja [nossa página de contato](%{base_path}/about).
+          Eu sou apenas um robô, mas, se você quiser falar com uma pessoal real, acesse [nossa página de contato](%{base_path}/about).
 
-          Enquanto isso, eu vou ficar fora do seu caminho.
+          Enquanto isso, não vou atrapalhar.
     new_user_narrative:
       reset_trigger: "tutorial"
-      title: "Certificado de conclusão de tutorial de novo usuário"
-      cert_title: "Como forma de reconhecimento por completar com sucesso o tutorial de novo usuário"
+      title: "Certificado de conclusão de tutorial de novo(a) usuário(a)"
+      cert_title: "Como forma de reconhecimento por concluir o tutorial de novo(a) usuário(a)"
       hello:
         title: "Saudações!"
         message: |-
-          Obrigado por se juntar a %{title}, e seja bem vindo!
+          Obrigado por participar de %{title}, boas-vindas!
 
-          - Eu sou apenas um robô, mas [nossa amigável staff](%{base_uri}/about) também está aqui para ajudar se você precisar falar com uma pessoa.
+          - Eu sou apenas um robô, mas [nossa equipe prestativa](%{base_uri}/about) também está aqui para ajudar se você precisar falar com uma pessoa.
 
-          - Por motivos de segurança, limitamos temporariamente o que os novos usuários podem fazer. Você ganhará [novas habilidades](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) (e [emblemas](%{base_uri}/badges)) à medida que o conhecermos.
+          - Por motivos de segurança, limitamos temporariamente o que os(as) novos(as) usuários(as) podem fazer. Você ganhará [novas capacidades](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) (e [badges](%{base_uri}/badges)) à medida que sabemos mais sobre você.
 
-          - Nós acreditamos em [comportamento comunitário civilizado](%{base_uri}/guidelines) em todos os momentos.
+          - Acreditamos em [comportamento comunitário saudável](%{base_uri}/guidelines) em todos os momentos.
       onebox:
         instructions: |-
-          Próximo, você pode compartilhar um destes links comigo? Responda com **um link em uma linha por si só**, e ele irá automaticamente expandir para incluir um elegante resumo.
+          Em seguida, você pode compartilhar um destes links comigo? Responda com **um link em apenas uma linha**, e ele irá automaticamente se expandir para incluir um belo resumo.
 
           Para copiar qualquer link, toque e segure em dispositivos móveis, ou clique com o botão direito do mouse:
 
@@ -166,11 +169,11 @@ pt_BR:
           <https://en.wikipedia.org/wiki/Death_by_coconut>
           <https://en.wikipedia.org/wiki/Calculator_spelling>
         reply: |-
-          Legal! Isto vai funcionar para a maioria dos <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> links. Lembre-se, ele precisa estar em um linha _por si só_, com nada mais na frente, ou atrás.
+          Legal! Isto vai funcionar para a maioria dos <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> links. Lembre-se de que ele precisa estar sozinho em uma linha, com nada mais à frente ou atrás.
         not_found: |-
-          Desculpa, eu não consegui encontrar o link na sua resposta! :cry:
+          Desculpe, não consegui encontrar o link na sua resposta! :cry:
 
-          Você pode tentar adicionar o link abaixo, em sua própria linha, na sua próxima resposta?
+          Você pode tentar adicionar o link abaixo, sozinho em uma linha, na sua próxima resposta?
 
           <https://en.wikipedia.org/wiki/Exotic_Shorthair>
       images:
@@ -179,19 +182,19 @@ pt_BR:
 
           <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
 
-          Se você gostou (e quem não gostaria), vá em frente e aperte o botão :heart: de curtir abaixo da postagem para que eu fique sabendo.
+          Se você tiver gostado (e quem não gostaria), vá em frente e aperte o botão :heart: de curtir abaixo da postagem para que eu fique sabendo.
 
-          Você pode **responder com uma imagem?** Qualquer imagem serve! Arraste e solte, pressione o botão de upload, ou até mesmo copie e cole.
+          Você pode **responder com uma imagem?** Qualquer imagem serve! Arraste e solte, pressione o botão de envio, ou até copie e cole.
         reply: |-
-          Imagem bacana – eu pressionei o botão :heart: de curtir para que você saiba o quanto eu gostei dela :heart_eyes:
+          Imagem bacana. Apertei o botão :heart: de curtir para que você saiba como eu gostei dela :heart_eyes:
         like_not_found: |-
-          Você esqueceu de curtir :heart: minha [postagem?](%{url}) :crying_cat_face:
+          Você se esqueceu de curtir :heart: minha [postagem?](%{url}) :crying_cat_face:
         not_found: |-
-          Parece que você não fez o upload de uma imagem, então eu escolhi uma foto que eu tenho _certeza_ que você vai gostar.
+          Parece que você não enviou uma imagem, então eu escolhi uma foto que eu tenho _certeza_ de que você vai gostar.
 
           <%{image_url}>
 
-          Tente fazer o upload desta foto a seguir ou colar o link em uma linha por si só!
+          Tente enviar a foto a seguir ou colar o link em uma linha!
       likes:
         instructions: |-
           Aqui está a foto de um unicórnio:
@@ -207,41 +210,41 @@ pt_BR:
         instructions: |-
           Você pode colocar algumas palavras em **negrito** ou _itálico_ na sua resposta?
 
-          - digite `**negrito**` ou `_itálico_`
+          - digite "**negrito**" ou "_itálico_"
 
           - ou, aperte o botão <kbd><b>B</b></kbd> ou <kbd><i>I</i></kbd> no editor
         reply: |-
-          Ótimo! HTML e BBCode também servem para formatação – para saber mais, [veja este tutorial](http://commonmark.org/help) :nerd:
+          Ótimo! HTML e BBCode também servem para formatação. Para saber mais, [acesse este tutorial](http://commonmark.org/help) :nerd:
         not_found: |-
           Aww, não encontrei nenhuma formatação na sua resposta. :pencil2:
 
-          Você pode tentar de novo? Use o botão <kbd><b>B</b></kbd> negrito ou <kbd><i>I</i></kbd> itálico no editor se você tiver dificuldades.
+          Você pode tentar de novo? Use o botão <kbd><b>B</b></kbd> negrito ou <kbd><i>I</i></kbd> itálico no editor se você tiver dificuldade.
       quoting:
         instructions: |-
-          Você pode tentar me citar quando responder, para que eu saiba exatamente a qual parte você está respondendo?
+          Você pode tentar me citar quando responder, para que eu saiba exatamente à qual parte você está respondendo?
 
-          > Se isto é café, por favor me traga um pouco de chá; mas se isto é chá, por favor me traga um pouco de café.
+          > Se isto é café, traga um pouco de chá, por favor. Mas se for chá, traga um pouco de café, por favor.
           >
-          > Uma vantagem de falar consigo mesmo é que você sabe que pelo menos alguém está ouvindo.
+          > Uma vantagem de falar consigo é que você sabe que pelo menos alguém está ouvindo.
           >
-          > Algumas pessoas têm jeito com as palavras, e outras pessoas… hum, eh, não ter jeito.
+          > Algumas pessoas levam jeito com as palavras, enquanto outras… hum, eh, não nasceram para isso.
 
-          Selecione o texto de qualquer &uarr; citação que você preferir, e então pressione o botão **Citação** que aparece em cima da sua seleção – ou o botão **Responder** embaixo desta postagem.
+          Selecione o texto de qualquer &uarr; citação que você preferir, então pressione o botão **Citação** que aparece em cima da sua seleção, ou o botão **Responder** abaixo desta postagem.
 
-          Abaixo da citação, digite uma palavra ou outra sobre por que você a escolheu, porque eu estou curioso :thinking:
+          Abaixo da citação, digite algumas palavras sobre por que você a escolheu. Estou morrendo de curiosidade :thinking:
         reply: |-
           Bom trabalho, você escolheu minha citação favorita! :left_speech_bubble:
         not_found: |-
-          Hmm, parece que você não me citou na sua resposta?
+          Hmm, será que você não me citou na sua resposta?
 
-          Selecionar qualquer texto na minha postagem trará o botão<kbd>**Citação**</kbd>. E pressionar **Responder** com qualquer texto selecionado também funcionará! Você pode tentar de novo?
+          Selecione qualquer texto na minha postagem para exibir o botão<kbd>**Citação**</kbd>. Pressionar **Responder** com qualquer texto selecionado também funcionará! Pode tentar de novo?
       bookmark:
         instructions: |-
-          Se você quiser saber mais, selecione <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> abaixo e <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **marque esta mensagem pessoal como favorita**. Se você fizer isto, pode haver um :gift: no seu futuro!
+          Se quiser saber mais, selecione <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> abaixo e <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **marque esta mensagem pessoal como favorita**. Se fizer isto, pode ter um :gift: no seu futuro!
         reply: |-
-          Excelente! Agora você pode facilmente encontrar o caminho de volta para nossa conversa privada a qualquer momento, direto da [aba favoritos em seu perfil] (%{bookmark_url}). Basta selecionar sua foto de perfil no canto superior direito &#8599;
+          Excelente! Agora você pode encontrar facilmente o caminho de volta para nossa conversa privada a qualquer momento, direto n [aba favoritos em seu perfil] (%{bookmark_url}). Basta selecionar sua foto de perfil no canto superior à direita &#8599;
         not_found: |-
-          Oh oh, não vejo nenhum favorito neste tópico. Você encontrou o marcador embaixo de cada postagem? Use o mostrar mais <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> para revelar ações adicionais, se necessário.
+          Ah não, não vejo nenhum favorito neste tópico. Você encontrou o marcador embaixo de cada postagem? Use o Mostrar mais <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> para revelar ações adicionais, se necessário.
       emoji:
         instructions: |-
           Você pode ter me visto usando pequenas imagens em minhas respostas :blue_car::dash: elas são chamadas de [emoji](https://en.wikipedia.org/wiki/Emoji). Você pode **adicionar um emoji** à sua resposta? Qualquer um destes irá funcionar:
@@ -254,68 +257,74 @@ pt_BR:
         reply: |-
           Isto é :sparkles: _emojitástico!_ :sparkles:
         not_found: |-
-          Oops, não vejo nenhum Emoji na sua resposta? Ah não! :sob:
+          Oops, não vejo nenhum emoji na sua resposta? Ah não! :sob:
 
-          Tente digitar dois pontos <kbd>:</kbd> para abrir o seletor de emoji, e então digite as primeiras letras do que você deseja, como `:bird:`
+          Tente digitar dois pontos <kbd>:</kbd> para abrir o seletor de emojis e em seguida digite as primeiras letras do que você deseja, como ":bird:"
 
           Ou, pressione o botão de emoji <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> no editor.
 
-          (Se estiver em um dispositivo móvel, você também pode inserir emoji diretamente do seu teclado.)
+          (Se estiver em um dispositivo móvel, você também pode inserir o emoji direto do seu teclado.)
       mention:
         instructions: |-
-          Às vezes, você pode querer chamar a atenção de uma pessoa, mesmo que não esteja respondendo diretamente a ela. Digite `@` e preencha nome de usuário delas para mencioná-las.
+          Às vezes, você pode querer chamar a atenção de uma pessoa, mesmo que não esteja respondendo diretamente a ela. Digite "@' e preencha o seu nome de usuário(a) para mencionar.
 
-          Você pode mencionar **`@%{discobot_username}`** na sua resposta?
+          Você pode mencionar **"@%{discobot_username}"** na sua resposta?
         reply: |-
           _Alguém disse o meu nome?_ :raised_hand: Eu acho que sim! :wave: Bem, aqui estou! Obrigado por me mencionar. :ok_hand:
         not_found: |-
-          Eu não vejo meu nome em nenhum lugar lá :frowning: Você pode tentar me mencionar como `@%{discobot_username}` de novo?
+          Eu não vejo meu nome em nenhum lugar :frowning: Você pode tentar me mencionar como "@%{discobot_username}" de novo?
 
-          (E sim, meu nome de usuário é soletrado _disco_, como na mania de dança dos anos 70. Eu realmente [amo a vida noturna!](https://www.youtube.com/watch?v=B_wGI3_sGf8) :dancer:)
+          (Sim, meu nome de usuário(a) é soletrado _disco_, como na febre de dança dos anos 70. Eu realmente [amo me divertir à noite!](https://www.youtube.com/watch?v=B_wGI3_sGf8) :dancer:)
       flag:
+        instructions: |-
+          Gostamos de discussões amigáveis e precisamos da sua ajuda para [manter este ambiente saudável](%{guidelines_url}). Se constatar um problema, sinalize para avisar de forma privada o(a) autor(a) ou a nossa [equipe prestativa](%{about_url}). Há várias razões pelas quais você possa querer sinalizar uma postagem, que variam de uma simples sugestão de divisão de tópicos a claras violações dos padrões da comunidade. Caso selecione **Outra coisa**, você iniciará uma discussão por mensagem privada com os(as) moderadores(as) e poderá fazer mais perguntas.
+
+          > :imp: Escrevi uma coisa horrível aqui
+
+          Vá em frente e **sinalize esta postagem** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> e selecione **Não é apropriado** como o motivo!
         reply: |-
-          [Nossa staff](%{base_uri}/groups/staff) será notificada secretamente sobre a sua sinalização. Se membros suficientes da comunidade notificarem uma postagem, ela também será automaticamente oculta como uma precaução. (Já que eu na verdade não escrevi uma postagem inapropriada :angel:, tomei a liberdade de remover a sinalização por enquanto.)
+          [Nossa equipe](%{base_uri}/groups/staff) será notificada secretamente sobre o seu sinalizador. Se membros suficientes da comunidade sinalizarem uma postagem, ela também será automaticamente oculta como precaução. (Já que, na verdade, não escrevi uma postagem inapropriada :angel:, tomei a liberdade de remover o sinalizador por enquanto.)
         not_found: |-
-          Ah não, minha postagem inapropriada ainda não foi sinalizada. :worried: Você pode sinalizá-la como inapropriada usando a **bandeira** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">? Não se esqueça de usar o botão mostrar mais <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> para revelar mais ações para cada postagem.
+          Ah não, minha postagem inapropriada ainda não foi sinalizada. :worried: Você pode sinalizá-la como inapropriada usando o **sinalizador** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">? Não se esqueça de usar o botão Mostrar mais <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> para revelar mais ações para cada postagem.
       search:
         instructions: |-
-          _xiiu_ … eu escondi uma surpresa neste tópico. Se você está pronto para o desafio, **selecione o ícone de pesquisa** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> no canto superior direito &#8599; para pesquisar por ela.
+          _xiiu_ … Escondi uma surpresa neste tópico. Se você está pronto(a) para o desafio, **selecione o ícone de pesquisa** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> no canto superior à direita &#8599; para pesquisar por ela.
 
-          Tente pesquisar pelo termo "capy&#8203;bara" (em inglês) neste tópico
+          Tente pesquisar o termo "capy&#8203;bara" (em inglês) neste tópico
         hidden_message: |-
           Como você perdeu esta capivara? :wink:
           <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
 
-          Você notou que agora está de volta ao começo? Alimente esta pobre capivara faminta **respondendo com o emoji `%{search_answer}` ** e você será automaticamente levado ao final.
+          Você notou que agora está de volta no começo? Alimente esta pobre capivara faminta **respondendo com o emoji "%{search_answer}" ** e você será automaticamente levado(a) ao final.
         reply: |-
-          Yay você a encontrou :tada:
+          Viva! Você a encontrou :tada:
 
-          - Para pesquisas mais detalhadas, vá para a [página de pesquisa completa](%{search_url}).
+          - Para realizar pesquisas mais detalhadas, vá para a [página de pesquisa completa](%{search_url}).
 
-          - Para pular para qualquer lugar em uma discussão longa, experimente os controles da linha do tempo do tópico à direita (e em baixo, em dispositivos móveis).
+          - Para pular para qualquer lugar em uma discussão longa, experimente os controles da linha do tempo do tópico à direita (e em baixo, no dispositivos móveis).
 
-          - Se você tiver um :keyboard: físico, pressione<kbd>?</kbd> para ver nossos úteis atalhos de teclado.
+          - Se você tiver um :keyboard: físico, pressione<kbd>?</kbd> para ver nossos atalhos de teclado.
         not_found: |-
-          Hmm… parece que você está tendo dificuldades. Desculpa. Você pesquisou <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> pelo termo **capy&#8203;bara** (em inglês)?
+          Hmm… parece que você está tendo dificuldades. Desculpe. Você pesquisou <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> pelo termo **capy&#8203;bara** (em inglês)?
       end:
         message: |-
-          Obrigado por ficar comigo @%{username}! Eu fiz isso para você, eu acho que você merece:
+          Obrigado por ficar comigo @%{username}! Fiz isso para você, eu acho que você merece:
 
           %{certificate}
 
-          Por agora é só! Dá uma olhada nos [**nossos últimos tópicos de discussão**](%{base_uri}/latest) ou [**categorias de discussões**](%{base_uri}/categories). :sunglasses:
+          Por enquanto é só! Dê uma olhada nos [**nossos últimos tópicos de discussão**](%{base_uri}/latest) ou [**categorias de discussões**](%{base_uri}/categories). :sunglasses:
 
-          (Se você quiser falar comigo de novo para aprender mais, é só me enviar uma mensagem ou mencionar `@%{discobot_username}` a qualquer momento!)
+          (Se você quiser falar comigo de novo para saber mais, é só me enviar uma mensagem ou mencionar "@%{discobot_username}" a qualquer momento!)
       certificate:
-        alt: "Certificado de Conquista"
+        alt: "Certificado de conquista"
     advanced_user_narrative:
       reset_trigger: "tutorial avançado"
-      cert_title: "Em reconhecimento à conclusão bem-sucedida do tutorial de usuário avançado"
-      title: ":arrow_up: Recursos avançados de usuário"
+      cert_title: "Em reconhecimento à conclusão do tutorial de usuário(a) avançado(a)"
+      title: ":arrow_up: Recursos avançados de usuário(a)"
       start_message: |-
-        Como um usuário _avançado_, você já visitou a sua [página de preferências](%{base_uri}/my/preferences) @%{username}? Existem inúmeras maneiras de personalizar a sua experiência, como por exemplo selecionar um tema escuro ou claro.
+        Como um usuário(a) avançado(a), você já acessou a sua [página de preferências](%{base_uri}/my/preferences) @%{username}? Existem inúmeras maneiras de personalizar a sua experiência, como, por exemplo, selecionar um tema escuro ou claro.
 
-        Mas estou divagando, vamos começar!
+        Mas estou enrolando, vamos começar!
       edit:
         bot_created_post_raw: "@%{discobot_username} é, de longe, o robô mais legal que conheço :wink:"
         instructions: |-
@@ -323,43 +332,43 @@ pt_BR:
 
           Você pode começar **editando** a postagem que acabei de criar em seu nome?
         not_found: |-
-          Parece que você ainda não editou a [postagem](%{url}) que eu criei para você. Você pode tentar de novo?
+          Parece que você ainda não editou a [post](%{url}) que eu criei para você. Pode tentar de novo?
 
           Use o ícone <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-pencil.png" width="16" height="16"> para abrir o editor.
         reply: |-
           Ótimo trabalho!
 
-          Observe que as edições feitas após 5 minutos aparecerão como revisões de edição pública, e um pequeno ícone de lápis aparecerá no canto superior direito com a contagem de revisões.
+          Observe que as edições feitas após 5 minutos aparecerão como revisões de edição pública, e um pequeno ícone de lápis aparecerá no canto superior à direita com a contagem de revisões.
       delete:
         instructions: |-
           Se quiser retirar uma postagem, você pode excluí-la.
 
-          Vá em frente e **exclua** qualquer uma das suas postagens acima usando a ação **excluir** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16">. Mas não exclua a primeira postagem!
+          Vá em frente e **exclua** qualquer uma das suas postagens acima com a ação **excluir** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16">. Mas não exclua a primeira postagem!
         not_found: |-
-          Eu ainda não vejo nenhuma postagem excluída. Lembre-se que <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> mostrar mais revelará <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> excluir.
+          Ainda não vejo nenhuma postagem excluída. Lembre-se de que <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> mostrar mais revelará <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> excluir.
         reply: |-
           Whoa! :boom:
 
-          Para preservar a continuidade das discussões, as exclusões não são imediatas; portanto, a postagem será removida depois de um tempo.
+          Para preservar a continuidade das discussões, as exclusões não são imediatas. Portanto, a postagem será removida depois de um tempo.
       recover:
         deleted_post_raw: "Por que @%{discobot_username} excluiu a minha postagem? :anguished:"
         instructions: |-
-          Ah não! Parece que eu acidentalmente excluí uma nova postagem que acabei de criar para você.
+          Ah não! Parece que eu excluí uma nova postagem sem querer, que acabei de criar para você.
 
           Você pode me fazer um favor e <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> **desfazer a exclusão** dela?
         not_found: |-
-          Tendo dificuldades? Lembre-se que <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> mostrar mais revelará <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> desfazer exclusão.
+          Está com dificuldades? Lembre-se de que <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> mostrar mais revelará <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> desfazer exclusão.
         reply: |-
-          Ufa, essa foi por pouco! Obrigado por corrigir aquilo :wink:
+          Ufa, essa foi por pouco! Obrigado pela correção :wink:
 
           Note que você só tem %{deletion_after} hora(s) para restaurar uma postagem.
       category_hashtag:
         instructions: |-
-          Você sabia que pode se referir a categorias e etiquetas em sua postagem? Por exemplo, você viu a categoria %{category}?
+          Você sabia que pode se referir a categorias e etiquetas em sua postagem? Por exemplo, viu a categoria %{category}?
 
-          Digite `#` no meio de uma sentença e selecione qualquer categoria ou etiqueta.
+          Digite "#" no meio de uma frase e selecione qualquer categoria ou etiqueta.
         not_found: |-
-          Hmm, eu não vejo uma categoria em nenhum lugar lá. Observe que `#` não pode ser o primeiro caractere. Você pode copiar isto na sua próxima resposta?
+          Hmm, eu não vejo uma categoria em nenhum lugar. Observe que "#' não pode ser o primeiro caractere. Você pode copiar isso na sua próxima resposta?
 
           ```text
           Eu posso criar um link de categoria via #
@@ -368,17 +377,17 @@ pt_BR:
           Excelente! Lembre-se de que isso funciona tanto para categorias quanto para etiquetas, se as etiquetas estiverem ativadas.
       change_topic_notification_level:
         instructions: |-
-          Cada tópico tem um nível de notificação. Ela começa em 'normal', o que significa que você normalmente só será notificado quando alguém estiver falando diretamente com você.
+          Cada tópico tem um nível de notificação. Começa em "normal", o que significa que você normalmente só será notificado(a) quando alguém estiver falando diretamente com você.
 
-          Por padrão, o nível de notificação de uma mensagem particular é definida como o nível mais alto de 'observando', o que significa que você será notificado sobre cada nova resposta. Mas você pode substituir o nível de notificação de _qualquer_ tópico para 'observando', 'acompanhando' ou 'silenciado'.
+          Por padrão, o nível de notificação de uma mensagem particular é definida como o nível mais alto de "acompanhando", o que significa que você será notificado(a) sobre cada nova resposta. Mas você pode substituir o nível de notificação de _qualquer_ tópico para "acompanhando", "monitorando" ou "silenciado"'.
 
-          Vamos tentar alterar o nível de notificação para este tópico. Na parte inferior do tópico, você encontrará um botão que mostra que você está **observando** este tópico. Você pode alterar o nível de notificação para **acompanhando**?
+          Vamos tentar alterar o nível de notificação para este tópico. Na parte inferior, você encontrará um botão que mostra que você está **acompanhando** este tópico. Poderia alterar o nível de notificação para **monitorando**?
         not_found: |-
-          Parece que você ainda está observando :eyes: este tópico! Se você estiver com dificuldades para encontrá-lo, o botão do nível de notificação está localizado na parte inferior do tópico.
+          Parece que você ainda está acompanhando :eyes: este tópico! Se você estiver com dificuldades para encontrá-lo, o botão do nível de notificação está localizado na parte inferior.
         reply: |-
-          Excelente trabalho! Eu espero que você não tenha silenciado este tópico, já que eu posso ser um tagarela de vez em quando :grin:.
+          Excelente trabalho! Eu espero que você não tenha silenciado este tópico, já que eu posso ser tagarela de vez em quando :grin:.
 
-          Observe que quando você responde a um tópico, or lê um tópico por mais de alguns minutos, ele é automaticamente alterado para um nível de notificação de 'acompanhando'. Você pode mudar isto em [suas preferências de usuário](%{base_uri}/my/preferences).
+          Observe que, quando você responde a um tópico, ou lê por mais de alguns minutos, ele é automaticamente alterado para um nível de notificação de "monitorando". Você pode mudar isso em [suas preferências de usuário(a)](%{base_uri}/my/preferences).
       poll:
         instructions: |-
           Você sabia que pode adicionar uma enquete a qualquer postagem? Tente usar a <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> engrenagem no editor para **montar uma enquete**.
@@ -402,11 +411,11 @@ pt_BR:
           [/poll]
       details:
         instructions: |-
-          Às vezes você pode desejar **esconder detalhes** em suas respostas:
+          Às vezes você pode querer **esconder detalhes** em suas respostas:
 
-          - Quando você estiver discutindo os pontos do enredo de um filme ou série que pudesse ser considerado um spoiler.
+          - Quando você estiver discutindo os pontos do enredo de um filme ou série que possa ser considerado um spoiler.
 
-          - Quando a sua postagem precisa de muitos detalhes opcionais que podem ser cansativos quando lidos todos de uma vez.
+          - Quando a sua postagem precisa de muitos detalhes opcionais que podem ser cansativos quando forem lidos todos de uma vez.
 
           [details=Selecione este para ver como funciona!]
           1. Selecione a <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> engrenagem no editor.
@@ -424,15 +433,15 @@ pt_BR:
           [/details]
           ```
         reply: |-
-          Ótimo trabalho — sua atenção nos _detalhes_ é admirável!
+          Ótimo trabalho, sua atenção aos _detalhes_ é admirável!
       end:
         message: |-
-          Você brilhou através disto como um _usuário avançado_ de fato :bow:
+          Você foi brilhante como um _usuário(a) avançado(a)_ :bow:
 
           %{certificate}
 
           É tudo o que tenho para você.
 
-          Por agora é só! Se você quiser falar comigo de novo para aprender mais, é só me enviar uma mensagem a qualquer momento :sunglasses:
+          Por enquanto é só! Se quiser falar comigo de novo para saber mais, basta me enviar uma mensagem a qualquer momento :sunglasses:
       certificate:
-        alt: "Certificado de Conquista do Curso de Usuário Avançado"
+        alt: "Certificado de conquista do curso de usuário(a) avançado(a)"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml b/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
index af083df259..05551783ac 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
@@ -6,71 +6,71 @@
 
 zh_CN:
   site_settings:
-    discourse_narrative_bot_enabled: "启用 Discourse 代表机器人（discobot）"
-    disable_discourse_narrative_bot_welcome_post: "禁止 Discourse 代表机器人发送欢迎帖子"
-    discourse_narrative_bot_ignored_usernames: "Discourse 代表机器人应该忽略的用户名"
-    discourse_narrative_bot_disable_public_replies: "禁止 Discourse 代表机器人发布公开回复"
-    discourse_narrative_bot_welcome_post_type: "Discourse 代表机器人应该发送的欢迎帖子类型"
-    discourse_narrative_bot_welcome_post_delay: "在 Discourse 代表机器人发送欢迎帖子前等待 (n) 秒。"
-    discourse_narrative_bot_skip_tutorials: "跳过Discourse叙事机器人教程"
+    discourse_narrative_bot_enabled: "启用 Discourse Narrative Bot (discobot)"
+    disable_discourse_narrative_bot_welcome_post: "禁用 Discourse Narrative Bot 的欢迎帖子"
+    discourse_narrative_bot_ignored_usernames: "Discourse Narrative Bot 应该忽略的用户名"
+    discourse_narrative_bot_disable_public_replies: "禁用 Discourse Narrative Bot 的公开回复"
+    discourse_narrative_bot_welcome_post_type: "Discourse Narrative Bot 应该发出的欢迎帖子类型"
+    discourse_narrative_bot_welcome_post_delay: "在发送 Discourse Narrative Bot 欢迎帖子之前等待 (n) 秒。"
+    discourse_narrative_bot_skip_tutorials: "要跳过的 Discourse Narrative Bot 教程"
   badges:
     certified:
-      name: 已合格
+      name: 已认证
       description: "已完成我们的新用户教程"
       long_description: |
-        该徽章授予完成我们交互式新用户教程的你。你已经有动力学习了讨论的基础工具，你现在已经合格了！
+        当您成功完成互动式新用户教程后，将授予此徽章。您已主动学习讨论的基本工具，现在您已获得认证！
     licensed:
-      name: 已证明
-      description: "完成了我们的高级用户教程"
+      name: 已授权
+      description: "已完成我们的高级用户教程"
       long_description: |
-        该徽章授予给完成交互式高级用户教程的你。你已经掌握了讨论的高级工具——本徽章就是你的证明！
+        当您成功完成互动式高级用户教程后，将授予此徽章。您已经掌握了讨论的高级工具 - 现在您已获得完全许可！
   discourse_narrative_bot:
-    bio: "你好，我不是一个真实存在的人类。我是一个可以带你了解这个站点的机器人。你可以通过给我发消息或提及我来与我交互。"
+    bio: "嗨，我不是真人。我是一个可以教你使用此网站的机器人。要与我互动，请给我发送消息或通过名字提及我。"
     tl2_promotion_message:
-      subject_template: "现在你已经晋升了，是时候学习高级功能了！"
+      subject_template: "现在，你已经升级，是时候了解一些高级功能了！"
       text_body_template: |
-        使用`@%{discobot_username} %{reset_trigger}`回复本消息可以找出更多功能。
+        使用 `@%{discobot_username} %{reset_trigger}` 回复本消息可以了解你还可以做什么。
     timeout:
       message: |-
-        你好， @%{username}。好久没见到你了，一切可好？
+        嘿，@%{username}。好久不见，一切可好？
 
-        - 你可以在任意时候回复我。
+        - 要继续，你可以随时回复我。
 
-        - 如果你想要跳过这个步骤，说`%{skip_trigger}`。
+        - 如果你想要跳过这个步骤，请说 `%{skip_trigger}`。
 
-        - 要重新开始，说`%{reset_trigger}`。
+        - 要重新开始，请说 `%{reset_trigger}`。
 
-        如果你不想的话也没问题。我是个机器人。你不会伤害到我。 :sob:
+        如果你不想也没问题。我是个机器人。你不会伤害到我。:sob:
     dice:
-      trigger: "骰子"
+      trigger: "投掷"
       invalid: |-
-        我很抱歉，数学上证明了不可能投出这种色子组合。 :confounded:
+        抱歉，数学上无法掷出该骰子组合。:confounded:
       not_enough_dice:
-        other: "我只有 %{count} 骰子。 [Shameful]\n(https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php)，我知道！"
+        other: "我只有 %{count} 个骰子。[Shameful]\n(https://www.toplessrobot.com/2009/04/the_10_most_shameful_rpg_dice.php)，我知道！"
       out_of_range: |-
-        你知道数学上[面最多](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice)的公平色子有 120 面么？
+        你知道数学上公平的骰子[最多有 120 个面](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice)吗？
       results: |-
         > :game_die: %{results}
     quote:
       trigger: "引用"
       "1":
-        quote: "每一个困难中存在着机会"
+        quote: "每一个困难中都蕴藏着机遇"
         author: "阿尔伯特·爱因斯坦"
       "2":
-        quote: "如果自由不包括犯错的自由，那么这个自由就不值得拥有。"
-        author: "默罕默德·甘地"
+        quote: "如果自由不包括犯错的自由，那么就不值得拥有。"
+        author: "圣雄甘地"
       "3":
-        quote: "不必为结束而哭泣，而要为曾经拥有而微笑。"
+        quote: "不要为结束而哭泣，而要为曾经拥有而微笑。"
         author: "苏斯博士"
       "4":
-        quote: "自己动手，丰衣足食。"
-        author: "查尔斯·纪尧姆·西安娜"
+        quote: "如果你想把事情做对，那就自己做。"
+        author: "查尔斯·纪尧姆·艾蒂安"
       "5":
         quote: "相信自己能成功，你就已经成功了一半。"
         author: "西奥多·罗斯福"
       "6":
-        quote: "生命就像一盒巧克力。你永远也不会知道你将拿到什么。"
-        author: "福雷斯特·甘普的妈妈"
+        quote: "生活就像一盒巧克力。你永远不知道你会得到什么。"
+        author: "福雷斯特·甘的妈妈"
       "7":
         quote: "这是我个人的一小步，却是全人类的一大步。"
         author: "尼尔·阿姆斯特朗"
@@ -81,7 +81,7 @@ zh_CN:
         quote: "如果一个人敢于承认错误，那么一切的错误都会被原谅。"
         author: "李小龙"
       "10":
-        quote: "心想事成。"
+        quote: "人只要敢于梦想，并对此坚信不疑，就一定能达成目标。"
         author: "拿破仑·希尔"
       results: |-
         > :left_speech_bubble: _%{quote}_ &mdash; %{author}
@@ -96,8 +96,8 @@ zh_CN:
         "6": "我觉得是"
         "7": "很可能"
         "8": "看起来不错"
-        "9": "是的"
-        "10": "标志指的是"
+        "9": "是"
+        "10": "迹象表明是"
         "11": "再随便回复试试"
         "12": "等等再问我"
         "13": "现在最好不告诉你"
@@ -105,7 +105,7 @@ zh_CN:
         "15": "专心然后再问一次"
         "16": "不要指望它"
         "17": "我的回答是不"
-        "18": "我的代码让我不谈钱"
+        "18": "我的消息来源说不"
         "19": "看起来不是很好"
         "20": "很可疑"
       result: |-
@@ -113,282 +113,288 @@ zh_CN:
     track_selector:
       reset_trigger: "开始"
       skip_trigger: "跳过"
-      help_trigger: "帮助"
+      help_trigger: "显示帮助"
       random_mention:
         reply: |-
-          你好！想看看我能做什么吗？说 `@%{discobot_username} %{help_trigger}`。
+          嗨！要了解我能说什么，请说 `@%{discobot_username} %{help_trigger}`。
         tracks: |-
-          我现在知道怎么办了：
+          我目前知道如何执行以下操作：
 
-          `@%{discobot_username}%{reset_trigger}{name-of-tutorial}`
-          > 在私信中为你开设一个交互式的教程。`{name-of-tutorial}` 可以是以下之一： `%{tracks}`。
+          `@%{discobot_username} %{reset_trigger} {name-of-tutorial}`
+          > 在个人消息中为你启动交互式教程。`{name-of-tutorial}` 可以是以下之一：`%{tracks}`。
         bot_actions: |-
           `@%{discobot_username} %{dice_trigger} 2d6`
-          > :game_die: 3, 6
+          > :game_die: 3、6
 
           `@%{discobot_username} %{quote_trigger}`
           %{quote_sample}
 
           `@%{discobot_username} %{magic_8_ball_trigger}`
-          > :crystal_ball: 你可能需要它
-        discobot_disabled: 你已在设置中关闭了我。你需要启用新用户入门技巧才能与我交互。
+          > :crystal_ball: 你可以信赖它
+        discobot_disabled: 你已在偏好设置中将我禁用。你需要允许新用户入门提示才能与我互动。
       do_not_understand:
         first_response: |-
-          你好，感谢回复！
+          嘿，感谢回复！
 
-          不幸的是，我是别人随手写的机器人，我其实不太懂这个。:frowning:
-        track_response: 你可以再试一次，或者你想要跳过这个步骤，说`%{skip_trigger}`。不然的话，说`%{reset_trigger}`重新开始。
+          很抱歉，我是一个随手编写的机器人，我其实不太懂你的回复。:frowning:
+        track_response: 你可以再试一次，或者如果你想跳过这一步，请说 `%{skip_trigger}`。否则，要重新开始，请说 `%{reset_trigger}`。
         second_response: |-
-          啊，抱歉。我还是没懂。 :anguished:
+          抱歉！我还是没懂。:anguished:
 
-          我只是个机器人，但是如果你想要找到真人，看看[我们的联系页面](%{base_path}/about)。
+          我只是个机器人，但是如果你想要联系真人，请参阅[我们的联系页面](%{base_path}/about)。
 
           同时，我不会再烦你了。
     new_user_narrative:
       reset_trigger: "教程"
-      title: "新用户教程完成证明"
-      cert_title: "你已经成功完成新用户教程了"
+      title: "新用户教程完成证书"
+      cert_title: "表彰成功完成新用户教程"
       hello:
         title: "欢迎！"
         message: |-
           感谢加入%{title}，欢迎！
 
-          - 我只是一个机器人，但是我们[友好的管理员](%{base_uri}/about)可以提供真人帮助。
+          - 我只是一个机器人，但是我们[友好的管理人员](%{base_uri}/about)可以提供真人帮助。
 
-          - 出于安全考虑，我们暂时限制新用户能够使用的功能。当我们更了解你的时候，你就可以获得[新功能](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) (还有 [徽章](%{base_uri}/badges))
+          - 出于安全原因，我们暂时限制了新用户的操作。随着我们对你的了解，你将获得[新能力](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/)（以及[徽章](%{base_uri}/badges)）。
 
-          - 我们一直坚守[社区文明守则](%{base_uri}/guidelines)。
+          - 我们始终相信[文明社区行为](%{base_uri}/guidelines)。
       onebox:
         instructions: |-
-          接下来，你能分享下列链接给我么？回复**单独一行的链接**，然后它会自动展开显示一个有用的摘要。
+          接下来，你能与我分享其中一个链接吗？以**一行一个链接的形式**回复，然后它会自动展开为包含一个漂亮的摘要。
 
-          要复制链接，在移动端点击并且保持，或者用你的鼠标右键：
+          要复制链接，在移动端设备上按住链接，或者右键点击你的鼠标：
 
           <https://en.wikipedia.org/wiki/Inherently_funny_word>
           <https://en.wikipedia.org/wiki/Death_by_coconut>
           <https://en.wikipedia.org/wiki/Calculator_spelling>
         reply: |-
-          酷！这对许多<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16">链接都管用。请记住，它必须占**单独的一行**，前后都没东西。
+          酷！这将适用于大多数 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> 链接。请记住，它必须**独占一行**，前后都没内容。
         not_found: |-
-          抱歉，我没在你的回复中找到链接！ :cry:
+          抱歉，我在你的回复中找不到链接！:cry:
 
-          在你的下个回复中，可以试着另起一行添加下面的链接吗？
+          你可以尝试在下一个回复中以独占一行的形式添加以下链接吗？
 
-          - https://en.wikipedia.org/wiki/Exotic_Shorthair
+          <https://en.wikipedia.org/wiki/Exotic_Shorthair>
       images:
         instructions: |-
-          这是一只独角兽的照片：
+          这是一张独角兽图片：
 
           <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
 
-          如果你喜欢它（谁不呢！）就在帖子的下方赞 :heart: 一下让我知道。
+          如果你喜欢它（谁不呢！），就按一下此帖子下方的赞 :heart: 按钮，让我知道。
 
-          你可以**带图片回复**吗？任何图片都行！拖入释放，点击上传按钮，或者把它复制粘贴进来。
+          你可以**带图片回复**吗？任何图片都行！拖放并按上传按钮，或者复制并粘贴。
         reply: |-
-          好赞的图片—我点了赞 :heart: ，你知道我很乐意看见它的 :heart_eyes:
+          漂亮的图片 - 我按下了赞 :heart: 按钮，让你知道我有多欣赏它 :heart_eyes:
         like_not_found: |-
-          你忘记点赞 :heart: 我的[帖子](%{url})了吗？ :crying_cat_face:
+          你忘记赞 :heart: 我的[帖子](%{url})了吗？:crying_cat_face:
         not_found: |-
-          你还没有上传图像，因此我为你选择了一张我觉得你会喜欢的。
+          你好像没有上传图片，所以我选择了一张我_确定_你会喜欢的图片。
 
           <%{image_url}>
 
-          上传另一个试试，也可以单独一行粘贴图片的链接！
+          下次尝试上传一张，或将链接单独粘贴到一行中！
       likes:
         instructions: |-
-          这是一只独角兽的照片：
+          这是一张独角兽图片：
 
           <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
 
-          如果你喜欢的话（谁会不喜欢呢！）点击帖子底部的赞:heart:按钮让我知道。
+          如果你喜欢它（谁不呢！），就按一下此帖子下方的赞 :heart: 按钮，让我知道。
         reply: |-
-          感谢你喜欢我的帖子！
+          感谢你赞我的帖子！
         not_found: |-
-          你忘记赞 :heart: 我的[帖子](%{url})了吗？ :crying_cat_face:
+          你忘记赞 :heart: 我的[帖子](%{url})了吗？:crying_cat_face:
       formatting:
         instructions: |-
-          你可以在下一个回复中加粗或斜体这些词语么？
+          你可以在回复中使用**粗体** 或_斜体_吗？
 
-          - 输入`**粗体**`或`_斜体_`
+          - 输入 `**bold**` 或 `_italic_`
 
-          - 或者，按编辑器上的按钮<kbd><b>B</b></kbd>或<kbd><i>I</i></kbd>
+          - 或者，按编辑器中的 <kbd><b>B</b></kbd> 或 <kbd><i>I</i></kbd> 按钮
         reply: |-
-          干得漂亮！HTML 和 BBCode 也可以用来格式化—想学更多，[试试这个教程](http://commonmark.org/help) :nerd:
+          做得好！HTML 和 BBCode 也适用于格式化 - 要了解更多信息，请[试试本教程](http://commonmark.org/help) :nerd:
         not_found: |-
-          啊，我在你的回复中没找到任何格式。 :pencil2:
+          哇，我在你的回复中没有找到任何格式。:pencil2:
 
-          你能再试试吗？如果你不知道怎么办了，按编辑器上的按钮 <kbd><b>B</b></kbd> 加粗或者<kbd><i>I</i></kbd> 斜体。
+          你能再试一次吗？如果遇到困难，请使用编辑器中的 <kbd><b>B</b></kbd> 粗体或 <kbd><i>I</i></kbd> 斜体按钮。
       quoting:
         instructions: |-
-          你能在回复的时候引用我的话吗，这样我就知道你在回复我什么了。
+          你回复的时候可以试着引用我的话吗？这样我就知道你在回复哪一部分。
 
-          > 如果这是咖啡，请给我些茶；但是如果这是茶，请给我些咖啡。
+          > 如果这是咖啡，请给我来杯茶；但如果这是茶，请给我来杯咖啡。
           >
-          > 和你自己说话一个优点是至少你知道有人在听。
+          > 自言自语的一个好处是你至少知道有人在听。
           >
-          > 有些人知道怎么说话，而另一些人……啊，哦，不知道。
+          > 有些人有办法说话，而另一些人… 呃，没有办法。
 
-          选择你喜欢的文字，然后在旁边弹出的地方按下**引用**—或者点击帖子底下的**回复**按钮。
+          选择你喜欢的任何 &uarr; 引文的文字，然后按在你的选择上方弹出的**引用** 按钮或此帖子底部的**回复**按钮。
 
-          在引用下面，输入一两个为什么你这么选的原因，我有点好奇 :thinking:
+          在引文下方，输入一两个词来说明你为什么选择这个，因为我很好奇 :thinking:
         reply: |-
           干得好，你选择了我最喜欢的一段！:left_speech_bubble:
         not_found: |-
           哈，看起来你没有在回复中引用我的话？
 
-          选择我帖子中的任何文字都会弹出<kbd>**引用**</kbd>按钮。然后选中文字的同时按下**回复**按钮也可以！你可以再试一次吗？
+          选择我帖子中的任何文字都会弹出<kbd>**引用**</kbd>按钮。然后在选中文字的同时按下**回复**按钮也可以！你可以再试一次吗？
       bookmark:
         instructions: |-
-          如果你想了解更多，请选择下方<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">并<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16">**收藏此私信**。如果你这样做，你一会可能收到份 :gift: ！
+          如果你想了解更多信息，请选择下面的 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> 和 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **将此个人消息加入书签**。如果这样做，你未来可能会获得 :gift:！
         reply: |-
-          太棒了！现在你可以在任何时候轻松地找到我们的私信，[你的个人页面收藏栏](%{bookmark_url})右边。只需点击你在右上方的个人头像 &#8599;
+          太棒了！现在，你可以随时轻松地从[你个人资料上的“书签”标签页](%{bookmark_url})返回我们的不公开对话。只需在右上角 &#8599; 选择你的个人资料照片
         not_found: |-
-          啊哦，我没有在此话题中看到有任何收藏。你看到每个帖子下方的收藏按钮了吗？如果需要的话，使用显示更多来<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">展开更多操作。
+          哎呀，我没有在此话题中看到任何书签。你看到每个帖子下方的“加入书签”按钮了吗？如果需要，使用“显示更多”<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> 来显示更多操作。
       emoji:
         instructions: |-
-          你可能已经看到我在回复中用了很多小图片 :blue_car::dash: 这些叫做[绘文字（Emoji）](https://zh.wikipedia.org/wiki/%E7%B9%AA%E6%96%87%E5%AD%97)。你能在回复中**使用一个 Emoji **吗？这些都可以用：
+          你可能已经看到我在回复中使用了小图片 :blue_car::dash:，这些图片被称为[表情符号](https://en.wikipedia.org/wiki/Emoji)。你可以在回复中**添加表情符号**吗？任何一个都可以：
 
           - 输入 `:) ;) :D :P :O`
 
-          - 输入冒号 <kbd>:</kbd> 然后输入完整的 Emoji 名字 `:tada:`
+          - 输入冒号 <kbd>:</kbd>，然后输入表情符号名称 `:tada:`
 
-          - 点击编辑器中的 Emoji 按钮<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16">，或者使用移动设备的键盘
+          - 在编辑器中或在你的移动键盘上按表情符号按钮 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16">
         reply: |-
-          这是 :sparkles: **Emoji 精神!** :sparkles:
+          这是 :sparkles: **表情符号精神！**:sparkles:
         not_found: |-
-          啊，我没有在你的回复中看到任何 Emoji？哦不！ :sob:
+          糟糕，我在你的回复中没有看到任何表情符号？不！:sob:
 
-          试试输入一个半角冒号<kbd>:</kbd>打开 emoji 选择器，然后输入你想要的表情对应单词的几个字母，比如 `:bird`。
+          尝试输入冒号 <kbd>:</kbd> 以调出表情符号选择器，然后输入你想要的前几个字母，例如 `:bird:`
 
-          或者，点击你编辑器里的 emoji 按钮<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16">。
+          或者，按编辑器中的表情符号按钮 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16">
 
-          （如果你正在用移动设备，你也可以试试直接在你的键盘里输入 Emoji）
+          （如果你使用的是移动设备，也可以直接从键盘输入表情符号。）
       mention:
         instructions: |-
-          有时你可能想要在回复别人的时候提醒另一个人。输入`@`然后是他们的用户名提及他们。
+          有时你可能想要引起某人的注意，即使你不直接回复他们。输入 `@`，然后输入他们的用户名以提及他们。
 
-          你能在回复中提及**@%{discobot_username}**吗？
+          你能在回复中提及 **`@%{discobot_username}`** 吗？
         reply: |-
-          **谁在找我！？** :raised_hand: 我觉得是你！ :wave: 好吧，我在这儿！感谢你提到我。 :ok_hand:
+          _有人叫过我的名字吗！？_ :raised_hand: 我相信是你！:wave: 嗯，我来了！谢谢你提及我。:ok_hand:
         not_found: |-
-          我没有在任何地方看到我的名字 :frowning: 你可以再 `@%{discobot_username}` 我试试？
+          我没有在任何地方看到我的名字 :frowning: 你可以再提及 `@%{discobot_username}` 来试试吗？
 
-          （是的，我的用户名是**disco**，和 1970 年流行的舞蹈同名）
+          （是的，我的用户名是 _disco_，和 1970 年流行的舞蹈同名。我[喜欢夜生活](https://www.youtube.com/watch?v=B_wGI3_sGf8)！:dancer:）
       flag:
+        instructions: |-
+          我们都喜欢友善的讨论，我们也需要您的帮助来[一起保持文明](%{guidelines_url})。如果您发现问题，请通过举报来私下告诉作者，或者通知[我们乐于助人的管理人员](%{about_url})。您可能想要举报帖子的原因有很多，从无害的话题拆分建议到明确的社区标准违规。如果您选择 **其他内容**，您将开始与版主的私信讨论，您可以在其中提出更多问题。
+
+          > :imp: 我在这写了些脏话
+
+          **举报此帖子** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> 并选择 **不当言论** 作为原因！
         reply: |-
-          [我们的管理人员](%{base_uri}/groups/staff)将私下通知你的标记。如果有足够的社区成员标记帖子，作为预防措施它也会自动隐藏。（因为我实际上并没有写一篇讨厌的帖子:angel:我现在已经取消了标记。）
+          [我们的管理人员](%{base_uri}/groups/staff)将单独收到你的举报通知。如果有足够的社区成员举报帖子，作为预防措施，它也会被自动隐藏。（因为我实际上并没有写一篇讨厌的帖子:angel:，我现在已经移除了举报。）
         not_found: |-
-          不好，我讨厌的发帖还未被标记为不当内容。:worried:你能使用**标记**<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">将其标记为不当内容吗？不要忘记使用显示更多的按钮<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">为每个帖子显示更多的操作选项。
+          哦不，我讨厌的帖子还没有被举报为不当言论。:worried: 你可以使用**举报** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> 将其举报为不当言论吗？不要忘记使用“显示更多”按钮 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> 来显示每个帖子的更多操作。
       search:
         instructions: |-
-          呼…我已经在这个话题中隐藏了一个惊喜。如果你想挑战的话，点击右上角&#8599;的**搜索按钮** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16">来找到它。
+          呼…我已经在这个话题中隐藏了一个惊喜。如果你想挑战的话，点击右上角 &#8599; 的**搜索图标** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> 来找到它。
 
-          试试在这个话题中搜索关键词“capy&#8203;bara”
+          试试在这个话题中搜索关键字“capy&#8203;bara”
         hidden_message: |-
-          你怎么错过了这只水豚？ :wink:
+          你怎么错过了这只水豚？:wink:
 
           <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
 
-          注意到你回到话题开头了么？**使用颜文字`%{search_answer}`回复**来给这只可怜又饥饿水豚投食吧，之后你就会自动回到底部。
+          注意到你回到开头了吗？**使用表情符号 `%{search_answer}` 回复**来给这只可怜又饥饿的水豚投食吧，之后你就会自动回到底部。
         reply: |-
           你找到啦 :tada:
 
-          - 想用更复杂的条件搜索，前往[全文搜索页](%{search_url})。
+          - 如果想进行更详细的搜索，请前往[完整搜索页面](%{search_url})。
 
-          - 想在长讨论中任意跳转的话，试试右侧（移动端在下方）的话题时间线控制器。
+          - 要想在长讨论中任意跳转，试试右侧（如果是移动设备，则在下方）的话题时间线控件。
 
-          - 如果你有 :keyboard:，按下<kbd>?</kbd>查看有用的键盘快捷键列表。
+          - 如果你有 :keyboard:，按 <kbd>?</kbd> 可以查看方便的键盘快捷键。
         not_found: |-
-          哈…看起来你碰到了些麻烦。抱歉。你试过搜索<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16">**capy&#8203;bara**了吗？
+          哈…看起来你碰到了些麻烦。抱歉。你试过搜索 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> **capy&#8203;bara**了吗？
       end:
         message: |-
-          感谢你坚持使用 @%{username}！我为你做了这个，我想你已经赢得了它：
+          感谢你坚持使用 @%{username} 提及我！我为你准备了这个，我想你已经赢得了它：
 
           %{certificate}
 
-          目前为止就这样了！查看[**我们最新的讨论话题**](%{base_uri}/latest)或[**在分类讨论**](%{base_uri}/categories)。:sunglasses:
+          目前为止就这样了！查看[**我们的最新讨论话题**](%{base_uri}/latest)或[**讨论类别**](%{base_uri}/categories)。:sunglasses:
 
           （如果你想再次与我交谈以了解更多信息，请随时留言或提及`@%{discobot_username}`！）
       certificate:
-        alt: "成就证明"
+        alt: "成就证书"
     advanced_user_narrative:
       reset_trigger: "高级教程"
-      cert_title: "你已经成功完成高级用户教程了"
-      title: ":arrow_up: 高级用户特性"
+      cert_title: "表彰成功完成高级用户教程"
+      title: ":arrow_up: 高级用户功能"
       start_message: |-
-        作为_advanced_用户，你是否访问过[你的偏好设置页面](%{base_uri}/my/preferences) @%{username}？ 有很多方法可以自定义你的体验，例如选择深色或浅色话题
+        @%{username}，作为_高级_用户，你是否访问过[你的偏好设置页面](%{base_uri}/my/preferences)？有很多方法可以自定义你的体验，例如选择深色或浅色主题。
 
-        但我离题了，让我们开始吧！
+        我离题了，让我们开始吧！
       edit:
-        bot_created_post_raw: "@%{discobot_username}是目前我了解的最酷的机器人 :wink:"
+        bot_created_post_raw: "@%{discobot_username} 是迄今为止我所知道的最酷的机器人 :wink:"
         instructions: |-
-          每个人都会犯错。但是不要担心，你永远可以编辑你的帖子修正他们！
+          每个人都会犯错。不过别担心，你可以随时编辑你的帖子来修正它们！
 
-          你可以开始**编辑**我替你创建的帖子么？
+          你能先**编辑**我刚刚代表你创建的帖子吗？
         not_found: |-
-          看起来你还没有编辑我为你创建的[帖子](%{url})。你能再试试么？
+          看起来你还没有编辑我为你创建的[帖子](%{url})。你能再试试吗？
 
-          用<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-pencil.png" width="16" height="16">图标来召唤编辑器。
+          使用 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-pencil.png" width="16" height="16"> 图标来调出编辑器。
         reply: |-
           干得漂亮！
 
-          注意下，你初次编辑后 5 分钟后的修改将会公开显示，一个小小的铅笔图标将出现在编辑次数的右上角。
+          请注意，5 分钟后所做的编辑将显示为公共编辑修订，并且右上角会出现一个带有修订计数的小铅笔图标。
       delete:
         instructions: |-
-          如果你想撤回你的帖子，你可以删除它。
+          如果你想撤回你的帖子，你可以将它删除。
 
-          使用<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16">**删除**动作来**删除**上方你的任意一个帖子。不过不要删除你的第一帖！
+          使用 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> **删除**操作来**删除**上方你的任意一个帖子。不过，不要删除你的第一个帖子！
         not_found: |-
-          我没有看到任何一帖被删除？记住点击<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">显示更多可以找到<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16">删除按钮。
+          我没有看到任何帖子被删除？记住，点击 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">“显示更多”可以显示 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> 删除按钮。
         reply: |-
-          哇！ :boom:
+          哇！:boom:
 
-          为了讨论的连贯性，删除不会立即发生，所以帖子将在之后移除。
+          为了讨论的连贯性，删除不会立即发生，所以帖子将在之后的某个时间被移除。
       recover:
-        deleted_post_raw: "为什么 @%{discobot_username}删除了我的帖子？:anguished:"
+        deleted_post_raw: "@%{discobot_username} 为什么删除了我的帖子？:anguished:"
         instructions: |-
           哦不！看起来我不小心删除了我刚刚给你创建的一个新帖子。
 
-          你可以帮我<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16">**恢复**它么？
+          你可以帮我 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> **取消删除**它吗？
         not_found: |-
-          碰到麻烦了？记住点击<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">显示更多可以找到<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16">恢复按钮。
+          碰到麻烦了？记住，点击 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">“显示更多”可以显示 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> 取消删除按钮。
         reply: |-
           呼，差点啊！感谢你帮忙 :wink:
 
-          注意你只有%{deletion_after}小时的时间去恢复一个帖子。
+          注意，你只有 %{deletion_after} 小时的时间可以取消删除帖子。
       category_hashtag:
         instructions: |-
-          你知道你可以在你的帖子中提到分类和标签么？例如，你看到过%{category}分类了吗？
+          你知道你可以在你的帖子中引用类别和标签吗？例如，你看到过%{category}类别吗？
 
-          输入`#`然后选择一个分类或标签。
+          在句子中输入`#`，然后选择任意类别或标签。
         not_found: |-
-          哈，我没有看到分类啊。注意`#`不能是第一个字符。你能在下一个回复中拷贝它吗？
+          哈，我没有在任何地方看到类别。注意，`#` 不能是第一个字符。你能在下一个回复中复制它吗？
 
           ```text
-          我能用#创建一个分类链接
+          我可以通过 # 创建一个类别链接
           ```
         reply: |-
-          漂亮！记住这对分类和标签（如果站点启用了它的话）都有用。
+          漂亮！记住，这对类别_和_标签（如果已启用）都适用。
       change_topic_notification_level:
         instructions: |-
-          每个话题都有通知等级。默认为“普通”，只有别人直接回复你的时候才会提醒你。
+          每个话题都有一个通知级别。默认为“常规”，表示只有别人直接回复你时才会通知你。
 
-          默认情况下，私信中的通知等级被设为最高级“监看”，即你将收到每个新回复的提醒。但是你可以改变任意一个话题的通知等级至“监看”、“追踪”或“静音”。
+          默认情况下，私信中的通知级别被设为最高级别“关注”，即你将收到每个新回复的通知。但是，你可以将任意一个话题的通知级别更改为“关注”、“跟踪”或“已设为免打扰”。
 
-          让我们试试改变这个话题的通知等级。在话题最下方，你可以看到一个**监看**的按钮。你可以把通知等级改成**追踪**吗？
+          让我们尝试更改这个话题的通知级别。在话题底部，你可以看到一个表示你正在**关注**此话题的按钮。你可以将通知级别改成**跟踪**吗？
         not_found: |-
-          看起来你仍在关注 :eyes: 这个话题！不知道如何关注？通知等级按钮就在话题的下方。
+          看起来你仍在关注 :eyes: 这个话题！如果你找不到，通知级别按钮位于话题底部。
         reply: |-
-          太棒了！我希望你没有把这个话题静音，因为我有时会说话有点健谈:grin:。
+          太棒了！我希望你没有将这个话题设为免打扰，因为我有时会有点健谈 :grin:。
 
-          请注意，当你回复话题或阅读话题超过几分钟时，它会自动设置为“跟踪”的通知级别。 你可以在[你的用户首选项](%{base_uri}/my/preferences)中更改此设置。
+          请注意，当你回复话题或阅读话题超过几分钟时，它会被自动设置为“跟踪”通知级别。 你可以在[你的用户偏好设置](%{base_uri}/my/preferences)中更改此设置。
       poll:
         instructions: |-
-          你知道你可以在任何帖子中添加投票吗？试试用编辑器中的<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16">齿轮图标来**发起投票**。
+          你知道你可以在任何帖子中添加投票吗？尝试使用编辑器中的 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> 齿轮图标来**构建投票**。
         not_found: |-
-          啊哦！你的回复中还没有任何投票。
+          哎呀！你的回复中还没有任何投票。
 
-          使用编辑器中的<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16">齿轮图标，或者在下个回复中复制粘贴以下投票：
+          使用编辑器中的 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> 齿轮图标，或者在下一个回复中复制粘贴以下投票：
 
           ```text
           [poll]
@@ -397,7 +403,7 @@ zh_CN:
           [/poll]
           ```
         reply: |-
-          棒！你看我是怎么教你的？
+          嘿，不错的投票！你看我是怎么教你的？
 
           [poll]
           * :+1:
@@ -405,37 +411,37 @@ zh_CN:
           [/poll]
       details:
         instructions: |-
-          有时你可能想在回复中**隐藏详情**：
+          有时你可能想在回复中**隐藏详细信息**：
 
-          - 当你讨论电影或者电视节目中可能剧透的情节时。
+          - 当你讨论电影或者电视节目中可能被视为剧透的情节时。
 
-          - 当你帖子中有大量一次性读完可能太困难的可选细节时。
+          - 当你的帖子中有大量一次性读完可能太困难的可选详细信息时。
 
-          [details=点这里看它如何工作！]
-          1. 点击编辑器中的<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16">齿轮图标。
-          2. 选择“隐藏详情”。
-          3. 编辑详情概要并添加内容。
+          [details=点这里查看运作方式！]
+          1. 点击编辑器中的 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> 齿轮图标。
+          2. 选择“隐藏详细信息”。
+          3. 编辑详细信息概要并添加内容。
           [/details]
 
-          你可以用编辑器中的<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16">齿轮图标在接下来的回复中添加一节详情吗？
+          你可以使用编辑器中的 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> 齿轮图标在你的下一个回复中添加详细信息部分吗？
         not_found: |-
-          添加详情控件时碰到麻烦了？试试在下个回复中包含下列文字：
+          创建详细信息微件时碰到麻烦了？试试在你的下一个回复中包含下列文字：
 
           ```text
-          [details=点击我查看详情]
-          这儿是详情
+          [details=点我查看详细信息]
+          这里是详细信息
           [/details]
           ```
         reply: |-
-          干得好—你很**注意**细节！
+          干得好 - 你对_细节_的关注令人钦佩！
       end:
         message: |-
-          你像个高级用户一样做完了教程。真的 :bow:
+          你像一个_高级用户_一样做完了教程。真的 :bow:
 
           %{certificate}
 
-          这是我能给你做的最多的事情了。
+          这是我为你准备的全部内容了。
 
-          再见啦！如果你想要继续和我交流，随时给我发消息 :sunglasses:
+          再见！如果你想要继续和我交流，随时给我发消息 :sunglasses:
       certificate:
-        alt: "高级用户终身成就证明"
+        alt: "高级用户跟踪成就证书"
diff --git a/plugins/discourse-presence/config/locales/server.bg.yml b/plugins/discourse-presence/config/locales/server.bg.yml
index 52333529d3..26cab515e7 100644
--- a/plugins/discourse-presence/config/locales/server.bg.yml
+++ b/plugins/discourse-presence/config/locales/server.bg.yml
@@ -5,3 +5,6 @@
 # https://translate.discourse.org/
 
 bg:
+  site_settings:
+    presence_enabled: "Да се покажат ли потребители, които в момента отговарят на текущата тема или редактират текущата публикация?"
+    presence_max_users_shown: "Показан е максимален брой потребители."
diff --git a/plugins/discourse-presence/config/locales/server.pt_BR.yml b/plugins/discourse-presence/config/locales/server.pt_BR.yml
index 9c9f577dce..47bed8941e 100644
--- a/plugins/discourse-presence/config/locales/server.pt_BR.yml
+++ b/plugins/discourse-presence/config/locales/server.pt_BR.yml
@@ -6,5 +6,5 @@
 
 pt_BR:
   site_settings:
-    presence_enabled: "Mostrar usuários que estão atualmente respondendo ao tópico atual, ou editando a postagem atual?"
-    presence_max_users_shown: "Número máximo de usuários mostrados."
+    presence_enabled: "Mostrar usuários(as) que estão agora respondendo ao tópico atual, ou editando a postagem atual?"
+    presence_max_users_shown: "Quantidade máximo de usuários(as) exibidos(as)."
diff --git a/plugins/discourse-presence/config/locales/server.zh_CN.yml b/plugins/discourse-presence/config/locales/server.zh_CN.yml
index 287524bd1a..227417f08a 100644
--- a/plugins/discourse-presence/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-presence/config/locales/server.zh_CN.yml
@@ -6,5 +6,5 @@
 
 zh_CN:
   site_settings:
-    presence_enabled: "展示当前正在回复当前话题或编辑当前帖子的用户？"
-    presence_max_users_shown: "展示用户的最大数量。"
+    presence_enabled: "显示当前正在回复当前话题或正在编辑当前帖子的用户？"
+    presence_max_users_shown: "显示的最大用户数。"
diff --git a/plugins/poll/config/locales/client.ar.yml b/plugins/poll/config/locales/client.ar.yml
index a032112048..02ad5914ce 100644
--- a/plugins/poll/config/locales/client.ar.yml
+++ b/plugins/poll/config/locales/client.ar.yml
@@ -32,7 +32,7 @@ ar:
         closed:
           title: "ستظهر النتائج بعد <strong>إغلاق الاستطلاع</strong>."
         staff:
-          title: "تظهر النتائج لأعضاء <strong>طاقم العمل</strong> فقط."
+          title: "تظهر النتائج لأعضاء <strong>فريق العمل</strong> فقط."
       cast-votes:
         title: "الإدلاء بصوتك"
         label: "صوِّت اﻵن!"
diff --git a/plugins/poll/config/locales/client.it.yml b/plugins/poll/config/locales/client.it.yml
index 544dd935f4..83b599bba0 100644
--- a/plugins/poll/config/locales/client.it.yml
+++ b/plugins/poll/config/locales/client.it.yml
@@ -89,18 +89,27 @@ it:
           multiple: Scelta Multipla
           number: Votazione Numerica
         poll_result:
+          label: Mostra i risultati...
           always: Sempre visibile
+          vote: Solo dopo la votazione
+          closed: Quando il sondaggio è chiuso
           staff: Solo staff
+        poll_groups:
+          label: Limita il voto a questi gruppi
         poll_chart_type:
+          label: Grafico dei risultati
           bar: Barra
           pie: Torta
         poll_config:
+          max: Numero max di scelte
+          min: Numero min di scelte
           step: Intervallo
         poll_public:
           label: Mostra i votanti
         poll_title:
           label: Titolo (facoltativo)
         poll_options:
+          label: Opzioni (una per riga)
           add: Aggiungi opzione
         automatic_close:
           label: Chiudi sondaggio automaticamente
diff --git a/plugins/poll/config/locales/client.ja.yml b/plugins/poll/config/locales/client.ja.yml
index f6ba3a1300..b6446e5f16 100644
--- a/plugins/poll/config/locales/client.ja.yml
+++ b/plugins/poll/config/locales/client.ja.yml
@@ -104,7 +104,7 @@ ja:
         poll_title:
           label: タイトル (オプション)
         poll_options:
-          label: オプション（1 行に 1 つ）
+          label: オプション (1 行に 1 つ)
           add: オプションを追加
         automatic_close:
           label: 投票を自動的にクローズする
diff --git a/plugins/poll/config/locales/client.pt_BR.yml b/plugins/poll/config/locales/client.pt_BR.yml
index cfb8032e0d..ea53d10c91 100644
--- a/plugins/poll/config/locales/client.pt_BR.yml
+++ b/plugins/poll/config/locales/client.pt_BR.yml
@@ -18,69 +18,100 @@ pt_BR:
         title: "Votos são <strong>públicos</strong>."
       results:
         groups:
-          title: "Você precisa ser membro de %{groups} para votar nesta votação."
+          title: "Você precisa ser membro de %{groups} para votar nesta enquete."
         vote:
           title: "Resultados serão mostrados ao <strong>votar</strong>."
         closed:
-          title: "Resultados serão mostrados quando a votação <strong>fechar</strong>."
+          title: "Resultados serão mostrados quando a votação <strong>terminar</strong>."
         staff:
-          title: "Resultados são somente mostrados para <strong>funcionários</strong> membros."
+          title: "Resultados são mostrados apenas para membros da <strong>equipe</strong>."
+      multiple:
+        help:
+          at_least_min_options:
+            one: "Escolha pelo menos <strong>%{count}</strong> opção."
+            other: "Escolha pelo menos <strong>%{count}</strong> opções."
+          up_to_max_options:
+            one: "Escolha até <strong>%{count}</strong> opção."
+            other: "Escolha até <strong>%{count}</strong> opções."
+          x_options:
+            one: "Escolha <strong>%{count}</strong> opção."
+            other: "Escolha <strong>%{count}</strong> opções."
+          between_min_and_max_options: "Escolha entre <strong>%{min}</strong> e <strong>%{max}</strong> opções."
       cast-votes:
-        title: "Registre seus votos"
+        title: "Participe da enquete"
         label: "Votar agora!"
       show-results:
-        title: "Mostrar o resultado da votação"
+        title: "Mostrar o resultado da enquete"
         label: "Mostrar resultados"
       hide-results:
         title: "Voltar para os seus votos"
         label: "Mostrar voto"
       group-results:
-        title: "Agrupar votos por campo de usuário"
-        label: "Mostrar detalhamento"
+        title: "Agrupar votos por campo de usuário(a)"
+        label: "Mostrar divisão"
       export-results:
-        title: "Exportar os resultados da pesquisa"
+        title: "Exportar os resultados da enquete"
         label: "Exportar"
       open:
-        title: "Abrir a votação"
+        title: "Abrir a enquete"
         label: "Abrir"
-        confirm: "Você tem certeza de que deseja abrir esta votação?"
+        confirm: "Você tem certeza de que deseja abrir esta enquete?"
       close:
-        title: "Fechar a votação"
+        title: "Fechar enquete"
         label: "Fechar"
-        confirm: "Você tem certeza de que deseja fechar esta votação?"
+        confirm: "Você tem certeza de que deseja fechar esta enquete?"
       automatic_close:
         closes_in: "Fecha em <strong>%{timeLeft}</strong>."
         age: "Fechou <strong>%{age}</strong>"
       breakdown:
+        title: "Resultados da enquete"
+        votes: "%{count} votos"
+        breakdown: "Divisão"
+        percentage: "Porcentagem"
         count: "Contagem"
-      error_while_toggling_status: "Desculpe, houve um erro ao mudar a situação desta votação."
+      error_while_toggling_status: "Desculpe, houve um erro ao mudar o status desta enquete."
       error_while_casting_votes: "Desculpe, houve um erro ao registrar os seus votos."
-      error_while_fetching_voters: "Desculpe, houve um erro ao mostrar os votantes."
+      error_while_fetching_voters: "Desculpe, houve um erro ao exibir os votantes."
       error_while_exporting_results: "Desculpe, houve um erro ao exportar os resultados da pesquisa."
       ui_builder:
-        title: Criar Votação
-        insert: Inserir Votação
+        title: Criar enquete
+        insert: Inserir enquete
         help:
-          options_min_count: Insira pelo menos 1 opção.
+          options_min_count: Insira pelo menos uma opção.
           options_max_count: Insira no máximo %{count} opções.
-          invalid_min_value: Valor mínimo deve ser pelo menos 1.
-          invalid_max_value: Valor máximo deve ser pelo menos 1, mas menor ou igual ao número de opções.
-          invalid_values: O valor mínimo precisa ser menor que o valor máximo.
+          invalid_min_value: O valor mínimo deve ser pelo menos 1.
+          invalid_max_value: O valor máximo deve ser pelo menos 1, mas menor ou igual ao número de opções.
+          invalid_values: O valor mínimo precisa ser menor do que o valor máximo.
           min_step_value: O valor mínimo de intervalo é 1
         poll_type:
           label: Tipo
-          regular: Única Escolha
-          multiple: Múltipla Escolha
-          number: Classificação Numérica
+          regular: Única escolha
+          multiple: Múltipla escolha
+          number: Classificação numérica
         poll_result:
+          label: Exibir resultados
           always: Sempre visível
-          staff: Somente pessoal autorizado
+          vote: Apenas após a votação
+          closed: Quando a enquete for encerrada
+          staff: Somente equipe
+        poll_groups:
+          label: Limitar votação a estes grupos
         poll_chart_type:
+          label: Gráfico de resultados
           bar: Barras
           pie: Pizza
         poll_config:
+          max: Escolhas máx.
+          min: Escolhas mínimas
           step: Intervalo
         poll_public:
           label: Exibir quem votou
+        poll_title:
+          label: Título (opcional)
+        poll_options:
+          label: Opções (uma por linha)
+          add: Adicionar opção
         automatic_close:
-          label: Fechar automaticamente a votação
+          label: Fechar automaticamente a enquete
+        show_advanced: "Exibir opções avançadas"
+        hide_advanced: "Ocultar opções avançadas"
diff --git a/plugins/poll/config/locales/client.zh_CN.yml b/plugins/poll/config/locales/client.zh_CN.yml
index 33848eeb00..5d7a6d69be 100644
--- a/plugins/poll/config/locales/client.zh_CN.yml
+++ b/plugins/poll/config/locales/client.zh_CN.yml
@@ -8,7 +8,7 @@ zh_CN:
   js:
     poll:
       voters:
-        other: "投票者"
+        other: "投票人"
       total_votes:
         other: "总票数"
       average_rating: "平均评分：<strong>%{average}</strong>。"
@@ -16,95 +16,95 @@ zh_CN:
         title: "投票为<strong>公开</strong>。"
       results:
         groups:
-          title: "你需要成为 %{groups} 的一员才能投票。"
+          title: "您需要成为 %{groups} 的成员才能在此投票中投票。"
         vote:
-          title: "结果将显示在<strong>投票</strong>上。"
+          title: "结果将在<strong>投票</strong>上显示。"
         closed:
-          title: "结果将显示一次<strong>关闭</strong>。"
+          title: "结果将在<strong>关闭</strong>后显示。"
         staff:
-          title: "结果仅显示给<strong>管理</strong>成员。"
+          title: "结果仅向<strong>管理人员</strong>成员显示。"
       multiple:
         help:
           at_least_min_options:
-            other: "至少选择<strong>%{count}</strong>个选项。"
+            other: "至少选择 <strong>%{count}</strong> 个选项。"
           up_to_max_options:
             other: "最多选择 <strong>%{count}</strong> 个选项。"
           x_options:
             other: "选择 <strong>%{count}</strong> 个选项。"
-          between_min_and_max_options: "选择<strong>%{min}</strong>到<strong>%{max}</strong>个选项。"
+          between_min_and_max_options: "选择 <strong>%{min}</strong> 到 <strong>%{max}</strong> 个选项。"
       cast-votes:
-        title: "投你的票"
-        label: "现在投票！"
+        title: "投票"
+        label: "立即投票！"
       show-results:
         title: "显示投票结果"
         label: "显示结果"
       hide-results:
-        title: "返回到你的投票"
+        title: "回到您的投票"
         label: "显示投票"
       group-results:
-        title: "按用户字段分组投票"
-        label: "显示错误"
+        title: "按用户字段将投票分组"
+        label: "显示细分"
       export-results:
-        title: "到处投票结果"
+        title: "导出投票结果"
         label: "导出"
       open:
-        title: "开启投票"
-        label: "开启"
-        confirm: "你确定要开启这个投票么？"
+        title: "打开投票"
+        label: "打开"
+        confirm: "确定要打开此投票吗？"
       close:
         title: "关闭投票"
         label: "关闭"
-        confirm: "你确定要关闭这个投票？"
+        confirm: "确定要关闭此投票吗？"
       automatic_close:
-        closes_in: "于<strong>%{timeLeft}</strong>关闭。"
-        age: "<strong>%{age}</strong>关闭"
+        closes_in: "在 <strong>%{timeLeft}</strong>后关闭。"
+        age: "已关闭 <strong>%{age}</strong>"
       breakdown:
         title: "投票结果"
         votes: "%{count} 票"
-        breakdown: "故障"
+        breakdown: "细分"
         percentage: "百分比"
         count: "计数"
-      error_while_toggling_status: "对不起，改变投票状态时出错了。"
-      error_while_casting_votes: "对不起，投票时出错了。"
-      error_while_fetching_voters: "对不起，显示投票者时出错了。"
+      error_while_toggling_status: "抱歉，切换此投票的状态时出错。"
+      error_while_casting_votes: "抱歉，投票时出错。"
+      error_while_fetching_voters: "抱歉，显示投票人时出错。"
       error_while_exporting_results: "抱歉，导出投票结果时出错。"
       ui_builder:
-        title: 创建投票
+        title: 构建投票
         insert: 插入投票
         help:
-          options_min_count: 输入至少 1 个选项。
+          options_min_count: 至少输入 1 个选项。
           options_max_count: 最多输入 %{count} 个选项。
-          invalid_min_value: 最小值必须至少为1。
-          invalid_max_value: 最大值必须至少是1，但小于或等于选项的数量。
+          invalid_min_value: 最小值必须至少为 1。
+          invalid_max_value: 最大值必须至少为 1，但小于或等于选项数。
           invalid_values: 最小值必须小于最大值。
-          min_step_value: 最小步长为1
+          min_step_value: 最小步长值为 1
         poll_type:
           label: 类型
           regular: 单选
           multiple: 多选
-          number: 评分
+          number: 分数
         poll_result:
-          label: 显示结果...
-          always: 总是可见
+          label: 显示结果…
+          always: 始终可见
           vote: 只在投票后
-          closed: 当投票被关闭
+          closed: 当投票被关闭后
           staff: 仅管理人员
         poll_groups:
-          label: 限制这些群组的投票
+          label: 将投票限制为这些群组
         poll_chart_type:
           label: 结果图表
-          bar: 条形
-          pie: 饼状
+          bar: 条形图
+          pie: 饼图
         poll_config:
           max: 最大选择
           min: 最小选择
-          step: 梯级
+          step: 步骤
         poll_public:
           label: 显示投票人
         poll_title:
-          label: 标题(可选)
+          label: 标题（可选）
         poll_options:
-          label: 选项(每行一个)
+          label: 选项（每行一个）
           add: 添加选项
         automatic_close:
           label: 自动关闭投票
diff --git a/plugins/poll/config/locales/server.ar.yml b/plugins/poll/config/locales/server.ar.yml
index 603e492db3..781161b9e7 100644
--- a/plugins/poll/config/locales/server.ar.yml
+++ b/plugins/poll/config/locales/server.ar.yml
@@ -41,6 +41,6 @@ ar:
     topic_must_be_open_to_vote: "يجب أن يكون الموضوع مفتوحًا للتصويت."
     poll_must_be_open_to_vote: "يجب أن يكون الاستطلاع مفتوحًا للتصويت."
     topic_must_be_open_to_toggle_status: "يجب أن يكون الموضوع مفتوحًا لتبديل الحالة."
-    only_staff_or_op_can_toggle_status: "يمكن لعضو طاقم العمل أو الناشر الأصلي فقط تبديل حالة الاستطلاع."
+    only_staff_or_op_can_toggle_status: "يمكن لعضو فريق العمل أو الناشر الأصلي فقط تبديل حالة الاستطلاع."
     email:
       link_to_poll: "انقر لعرض الاستطلاع."
diff --git a/plugins/poll/config/locales/server.pt_BR.yml b/plugins/poll/config/locales/server.pt_BR.yml
index 0ab3d96832..b1b4a7e251 100644
--- a/plugins/poll/config/locales/server.pt_BR.yml
+++ b/plugins/poll/config/locales/server.pt_BR.yml
@@ -6,11 +6,11 @@
 
 pt_BR:
   site_settings:
-    poll_enabled: "Permitir votações?"
-    poll_maximum_options: "Número máximo de opções permitidas em uma votação."
-    poll_edit_window_mins: "Número de minutos após a criação de uma postagem durante os quais votações podem ser editadas."
+    poll_enabled: "Permitir enquetes?"
+    poll_maximum_options: "Quantidade máxima de opções permitidas em uma enquete."
+    poll_edit_window_mins: "Quantidade de minutos após a criação de uma postagem pelos quais as enquetes podem ser editadas."
     poll_minimum_trust_level_to_create: "Defina o nível de confiança mínimo necessário para criar votações."
-    poll_groupable_user_fields: "Um conjunto de nomes de campo de usuário que podem ser usados para agrupar e filtrar os resultados da pesquisa."
+    poll_groupable_user_fields: "Um conjunto de nomes para o campo do(a) usuário(a) que podem ser usados para agrupar e filtrar os resultados da enquete."
     poll_export_data_explorer_query_id: "ID da consulta do Data Explorer para usar para exportar resultados de enquetes (0 para desativar)."
   poll:
     poll: "enquete"
diff --git a/plugins/poll/config/locales/server.zh_CN.yml b/plugins/poll/config/locales/server.zh_CN.yml
index 83f24780a8..cff9cbf568 100644
--- a/plugins/poll/config/locales/server.zh_CN.yml
+++ b/plugins/poll/config/locales/server.zh_CN.yml
@@ -8,40 +8,40 @@ zh_CN:
   site_settings:
     poll_enabled: "允许投票？"
     poll_maximum_options: "投票允许的最大选项数。"
-    poll_edit_window_mins: "投票创建后多少分钟内可以编辑？"
-    poll_minimum_trust_level_to_create: "创建投票所需的最小信任等级。"
-    poll_groupable_user_fields: "一组用户字段名称，可用于分组和过滤投票结果。"
-    poll_export_data_explorer_query_id: "用于导出投票结果的数据资源管理器查询的ID（0为禁用）。"
+    poll_edit_window_mins: "创建帖子后可以编辑投票的分钟数。"
+    poll_minimum_trust_level_to_create: "定义创建投票所需的最低信任级别。"
+    poll_groupable_user_fields: "一组可用于对投票结果进行分组和筛选的用户字段名称。"
+    poll_export_data_explorer_query_id: "用于导出投票结果的数据资源管理器查询的 ID（0 将禁用）。"
   poll:
     poll: "投票"
-    invalid_argument: "“%{argument}”参数的无效值“%{value}”。"
-    multiple_polls_without_name: "有多个投票没有名字。使用“<code>name</code>”属性区分各投票。"
-    multiple_polls_with_same_name: "有多个投票的名字相同：<strong>%{name}</strong>。使用“<code>name</code>”属性区分各投票。"
-    default_poll_must_have_at_least_1_option: "投票必须至少有一个选项。"
-    named_poll_must_have_at_least_1_option: "叫做 <strong>%{name}</strong> 的投票必须至少有一个选项。"
+    invalid_argument: "参数 '%{argument}' 的值 '%{value}' 无效。"
+    multiple_polls_without_name: "有多个没有名称的投票。使用 '<code>name</code>' 特性对您的投票进行唯一标识。"
+    multiple_polls_with_same_name: "有多个投票的名称相同：<strong>%{name}</strong>。使用 '<code>name</code>' 特性对您的投票进行唯一标识。"
+    default_poll_must_have_at_least_1_option: "投票必须至少有 1 个选项。"
+    named_poll_must_have_at_least_1_option: "名为“<strong>%{name}</strong>”的投票必须至少有 1 个选项。"
     default_poll_must_have_less_options:
-      other: "投票选项必须少于%{count}个。"
+      other: "投票选项必须少于 %{count} 个。"
     named_poll_must_have_less_options:
-      other: "“<strong>%{name}</strong>”投票的选项必须少于%{count}个。"
-    default_poll_must_have_different_options: "投票必须有不同的选项。"
-    named_poll_must_have_different_options: "投票“<strong>%{name}</strong>”的选项必须有不同的选项。"
-    default_poll_must_not_have_any_empty_options: "投票不得有任何空选项。"
-    named_poll_must_not_have_any_empty_options: "名为<strong>%{name}的</strong>投票不得包含任何空选项。"
-    default_poll_with_multiple_choices_has_invalid_parameters: "多选投票有无效选项。"
-    named_poll_with_multiple_choices_has_invalid_parameters: "“<strong>%{name}</strong>”多选投票有无效参数。"
-    requires_at_least_1_valid_option: "你必须选择至少 1 个有效的选项。"
+      other: "名为“<strong>%{name}</strong>”的投票的选项必须少于 %{count} 个。"
+    default_poll_must_have_different_options: "投票必须具有不同的选项。"
+    named_poll_must_have_different_options: "名为“<strong>%{name}</strong>”的投票必须具有不同的选项。"
+    default_poll_must_not_have_any_empty_options: "投票不得包含任何空选项。"
+    named_poll_must_not_have_any_empty_options: "名为“<strong>%{name}</strong>”的投票不得包含任何空选项。"
+    default_poll_with_multiple_choices_has_invalid_parameters: "多选投票具有无效参数。"
+    named_poll_with_multiple_choices_has_invalid_parameters: "名为“<strong>%{name}</strong>”的多选投票具有无效参数。"
+    requires_at_least_1_valid_option: "您必须至少选择 1 个有效选项。"
     edit_window_expired:
-      cannot_edit_default_poll_with_votes: "在创建%{minutes}分钟后，你无法更改投票。"
-      cannot_edit_named_poll_with_votes: "在创建%{minutes}分钟后，你无法更改投票名<strong>${name}</strong>。"
-    no_poll_with_this_name: "投票“<strong>%{name}</strong>”没有被关联到帖子。"
-    post_is_deleted: "帖子已经删除，无法操作。"
-    user_cant_post_in_topic: "你无法投票，因为你无法在这个话题里发帖"
-    topic_must_be_open_to_vote: "话题必须未被锁定才能投票。"
-    poll_must_be_open_to_vote: "投票必须开启。"
-    topic_must_be_open_to_toggle_status: "话题必须未被锁定才能改变状态。"
-    only_staff_or_op_can_toggle_status: "只有管理人员或者发布投票的人才能改变投票状态。"
-    insufficient_rights_to_create: "你不能创建投票。"
+      cannot_edit_default_poll_with_votes: "在创建 %{minutes} 分钟后，您将无法更改投票。"
+      cannot_edit_named_poll_with_votes: "在创建 %{minutes} 分钟后，您将无法更改投票名称“<strong>${name}</strong>”。"
+    no_poll_with_this_name: "没有与此帖子相关的名为“<strong>%{name}</strong>”的投票。"
+    post_is_deleted: "无法对已被删除的帖子执行操作。"
+    user_cant_post_in_topic: "您无法投票，因为您无法在此话题中发帖。"
+    topic_must_be_open_to_vote: "话题必须处于开放状态才能投票。"
+    poll_must_be_open_to_vote: "投票必须处于开放状态才能投票。"
+    topic_must_be_open_to_toggle_status: "话题必须处于开放状态才能切换状态。"
+    only_staff_or_op_can_toggle_status: "只有管理人员或者发布投票的人才能切换投票状态。"
+    insufficient_rights_to_create: "您无权创建投票。"
     email:
-      link_to_poll: "点击查看投票。"
+      link_to_poll: "点击以查看投票。"
     user_field:
-      no_data: "没有数据"
+      no_data: "无数据"
diff --git a/plugins/styleguide/config/locales/client.pt_BR.yml b/plugins/styleguide/config/locales/client.pt_BR.yml
index 4abc612d71..575acf2130 100644
--- a/plugins/styleguide/config/locales/client.pt_BR.yml
+++ b/plugins/styleguide/config/locales/client.pt_BR.yml
@@ -18,19 +18,70 @@ pt_BR:
           title: "Tipografia"
           example: "Boas-vindas ao Discourse"
           paragraph: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+        date_time_inputs:
+          title: "Entradas de data/hora"
+        font_scale:
+          title: "Sistema da fonte"
         colors:
           title: "Cores"
         icons:
           title: "Ícones"
+          full_list: "Exibir a lista completa de ícones incríveis de fonte"
+        input_fields:
+          title: "Campos de entrada"
+        buttons:
+          title: "Botões"
+        dropdowns:
+          title: "Menus suspensos"
         categories:
           title: "Categorias"
+        bread_crumbs:
+          title: "Navegação estrutural"
         navigation:
           title: "Navegação"
+        navigation_bar:
+          title: "Barra de navegação"
+        navigation_stacked:
+          title: "Navegação empilhada"
         categories_list:
           title: "Lista de categorias"
+        topic_link:
+          title: "Link de tópico"
+        topic_list_item:
+          title: "Item de lista de tópicos"
+        topic_statuses:
+          title: "Status do tópico"
+        topic_list:
+          title: "Lista de tópicos"
+        basic_topic_list:
+          title: "Lista de tópicos básicos"
+        footer_message:
+          title: "Mensagem de rodapé"
+        signup_cta:
+          title: "CTA de cadastro"
         topic_timer_info:
           title: "Timers de tópico"
+        topic_footer_buttons:
+          title: "Botões no rodapé do tópico"
+        topic_notifications:
+          title: "Notificações de tópico"
         post:
           title: "Postagem"
+        topic_map:
+          title: "Mapa do tópico"
+        site_header:
+          title: "Cabeçalho do site"
         suggested_topics:
           title: "Tópicos sugeridos"
+        post_menu:
+          title: "Menu de postagem"
+        modal:
+          title: "Modal"
+          header: "Título do modal"
+          footer: "Rodapé do modal"
+        user_about:
+          title: "Caixa Sobre do(a) usuário(a)"
+        header_icons:
+          title: "Ícones no cabeçalho"
+        spinners:
+          title: "Controle giratório"
diff --git a/plugins/styleguide/config/locales/client.zh_CN.yml b/plugins/styleguide/config/locales/client.zh_CN.yml
index 3bf9cbaa15..369278cd93 100644
--- a/plugins/styleguide/config/locales/client.zh_CN.yml
+++ b/plugins/styleguide/config/locales/client.zh_CN.yml
@@ -7,8 +7,8 @@
 zh_CN:
   js:
     styleguide:
-      title: "样式指引"
-      welcome: "从左侧菜单中选择一部分以开始使用"
+      title: "样式指南"
+      welcome: "首先，从左侧菜单中选择一个部分。"
       categories:
         atoms: 原子
         molecules: 分子
@@ -17,16 +17,16 @@ zh_CN:
         typography:
           title: "排版"
           example: "欢迎来到 Discourse"
-          paragraph: "占位符占位符占位符，那只敏捷的棕毛狐狸跳过了那条懒狗，那只敏捷的棕毛狐狸跳过了那条懒狗，占位符占位符占位符"
+          paragraph: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
         date_time_inputs:
-          title: "日期/时间输入框"
+          title: "日期/时间输入"
         font_scale:
           title: "字体系统"
         colors:
-          title: "配色"
+          title: "颜色"
         icons:
           title: "图标"
-          full_list: "查看全部 Font Awesome 图标"
+          full_list: "查看 Font Awesome 图标的完整列表"
         input_fields:
           title: "输入字段"
         buttons:
@@ -34,9 +34,9 @@ zh_CN:
         dropdowns:
           title: "下拉菜单"
         categories:
-          title: "分类"
+          title: "类别"
         bread_crumbs:
-          title: "面包屑"
+          title: "路径"
         navigation:
           title: "导航"
         navigation_bar:
@@ -44,7 +44,7 @@ zh_CN:
         navigation_stacked:
           title: "堆叠式导航"
         categories_list:
-          title: "分类列表"
+          title: "类别列表"
         topic_link:
           title: "话题链接"
         topic_list_item:
@@ -54,34 +54,34 @@ zh_CN:
         topic_list:
           title: "话题列表"
         basic_topic_list:
-          title: "基础话题列表"
+          title: "基本话题列表"
         footer_message:
-          title: "底栏信息"
+          title: "页脚消息"
         signup_cta:
-          title: "注册的 CTA"
+          title: "注册号召性用语"
         topic_timer_info:
           title: "话题计时器"
         topic_footer_buttons:
-          title: "话题底栏按钮"
+          title: "话题页脚按钮"
         topic_notifications:
           title: "话题通知"
         post:
           title: "帖子"
         topic_map:
-          title: "话题数据"
+          title: "话题图"
         site_header:
-          title: "站点顶栏"
+          title: "站点标头"
         suggested_topics:
-          title: "推荐话题"
+          title: "建议的话题"
         post_menu:
           title: "帖子菜单"
         modal:
-          title: "模态框"
-          header: "模态框标题"
-          footer: "模态框底栏"
+          title: "模式窗口"
+          header: "模式窗口标题"
+          footer: "模式窗口页脚"
         user_about:
           title: "用户信息框"
         header_icons:
-          title: "顶栏图标"
+          title: "标头图标"
         spinners:
-          title: "进度圈"
+          title: "旋转的图标"
diff --git a/plugins/styleguide/config/locales/server.ar.yml b/plugins/styleguide/config/locales/server.ar.yml
index 125ca0281b..a17f2985e2 100644
--- a/plugins/styleguide/config/locales/server.ar.yml
+++ b/plugins/styleguide/config/locales/server.ar.yml
@@ -6,5 +6,5 @@
 
 ar:
   site_settings:
-    styleguide_enabled: "تفعيل مسار `‎/styleguide` لتسهيل تخصيص أنماط Discourse"
+    styleguide_enabled: 'تفعيل مسار `‎/styleguide` لتسهيل تخصيص أنماط Discourse'
     styleguide_admin_only: "يقصِر رؤية دليل الأنماط على المسؤولين"
diff --git a/plugins/styleguide/config/locales/server.bg.yml b/plugins/styleguide/config/locales/server.bg.yml
index 52333529d3..d98910a732 100644
--- a/plugins/styleguide/config/locales/server.bg.yml
+++ b/plugins/styleguide/config/locales/server.bg.yml
@@ -5,3 +5,6 @@
 # https://translate.discourse.org/
 
 bg:
+  site_settings:
+    styleguide_enabled: 'Активирайте пътя `/styleguide`, за да подпомогнете стилизирането на Discourse'
+    styleguide_admin_only: "Ограничава видимостта на ръководството за стил до администратори"
diff --git a/plugins/styleguide/config/locales/server.da.yml b/plugins/styleguide/config/locales/server.da.yml
index 3e3146fc0f..417f1272cb 100644
--- a/plugins/styleguide/config/locales/server.da.yml
+++ b/plugins/styleguide/config/locales/server.da.yml
@@ -6,5 +6,5 @@
 
 da:
   site_settings:
-    styleguide_enabled: "Aktivér en `/styleguide` sti for at hjælpe med styling af Discourse"
+    styleguide_enabled: 'Aktivér en `/styleguide` sti for at hjælpe med styling af Discourse'
     styleguide_admin_only: "Begrænser synligheden af styleguiden til admins"
diff --git a/plugins/styleguide/config/locales/server.de.yml b/plugins/styleguide/config/locales/server.de.yml
index 831bef62f2..63a97a9d42 100644
--- a/plugins/styleguide/config/locales/server.de.yml
+++ b/plugins/styleguide/config/locales/server.de.yml
@@ -6,5 +6,5 @@
 
 de:
   site_settings:
-    styleguide_enabled: "Aktiviere den „/styleguide“-Pfad, um die Gestaltung deines Discourse zu erleichtern."
+    styleguide_enabled: 'Aktiviere den „/styleguide“-Pfad, um die Gestaltung deines Discourse zu erleichtern.'
     styleguide_admin_only: "Beschränkt die Sichtbarkeit des Styleguides auf Administratoren"
diff --git a/plugins/styleguide/config/locales/server.es.yml b/plugins/styleguide/config/locales/server.es.yml
index 66de888149..e90778c903 100644
--- a/plugins/styleguide/config/locales/server.es.yml
+++ b/plugins/styleguide/config/locales/server.es.yml
@@ -6,5 +6,5 @@
 
 es:
   site_settings:
-    styleguide_enabled: "Activar una ruta «/styleguide» para ayudar a personalizar el aspecto de Discourse"
+    styleguide_enabled: 'Activar una ruta «/styleguide» para ayudar a personalizar el aspecto de Discourse'
     styleguide_admin_only: "Solo permitir a los administradores ver la guía de estilo"
diff --git a/plugins/styleguide/config/locales/server.fi.yml b/plugins/styleguide/config/locales/server.fi.yml
index 97e1d75794..113b0091ac 100644
--- a/plugins/styleguide/config/locales/server.fi.yml
+++ b/plugins/styleguide/config/locales/server.fi.yml
@@ -6,5 +6,5 @@
 
 fi:
   site_settings:
-    styleguide_enabled: "Ota käyttöön `/styleguide`-polku, joka auttaa Discoursen tyylimuotoilussa"
+    styleguide_enabled: 'Ota käyttöön `/styleguide`-polku, joka auttaa Discoursen tyylimuotoilussa'
     styleguide_admin_only: "Rajoittaa tyylioppaan näkyvyyden ylläpitäjille"
diff --git a/plugins/styleguide/config/locales/server.fr.yml b/plugins/styleguide/config/locales/server.fr.yml
index a987c9cad9..40963ae101 100644
--- a/plugins/styleguide/config/locales/server.fr.yml
+++ b/plugins/styleguide/config/locales/server.fr.yml
@@ -6,5 +6,5 @@
 
 fr:
   site_settings:
-    styleguide_enabled: "Activer un chemin « /styleguide » pour faciliter la personnalisation de Discourse"
+    styleguide_enabled: 'Activer un chemin « /styleguide » pour faciliter la personnalisation de Discourse'
     styleguide_admin_only: "Restreint la visibilité du guide de style aux seuls administrateurs"
diff --git a/plugins/styleguide/config/locales/server.gl.yml b/plugins/styleguide/config/locales/server.gl.yml
index 8d56febda5..89e43805ae 100644
--- a/plugins/styleguide/config/locales/server.gl.yml
+++ b/plugins/styleguide/config/locales/server.gl.yml
@@ -6,5 +6,5 @@
 
 gl:
   site_settings:
-    styleguide_enabled: "Activar un camiño `/styleguide` para personalizar o estilo do Discourse"
+    styleguide_enabled: 'Activar un camiño `/styleguide` para personalizar o estilo do Discourse'
     styleguide_admin_only: "Restrinxe a visibilidade da guía de estilo aos administradores"
diff --git a/plugins/styleguide/config/locales/server.he.yml b/plugins/styleguide/config/locales/server.he.yml
index f123c02b6e..0b9d188e0f 100644
--- a/plugins/styleguide/config/locales/server.he.yml
+++ b/plugins/styleguide/config/locales/server.he.yml
@@ -6,5 +6,5 @@
 
 he:
   site_settings:
-    styleguide_enabled: "להפעיל נתיב `‎/styleguide` כדי לסייע בעיצוב של Discourse"
+    styleguide_enabled: 'להפעיל נתיב `‎/styleguide` כדי לסייע בעיצוב של Discourse'
     styleguide_admin_only: "מגביל את חשיפת מדריך הסגנון למנהלים"
diff --git a/plugins/styleguide/config/locales/server.hu.yml b/plugins/styleguide/config/locales/server.hu.yml
index c24ee08667..33cd52896f 100644
--- a/plugins/styleguide/config/locales/server.hu.yml
+++ b/plugins/styleguide/config/locales/server.hu.yml
@@ -6,5 +6,5 @@
 
 hu:
   site_settings:
-    styleguide_enabled: "A „/styleguide” elérési út engedélyezése a Discourse stílusmódosításainak megkönnyítéséhez"
+    styleguide_enabled: 'A „/styleguide” elérési út engedélyezése a Discourse stílusmódosításainak megkönnyítéséhez'
     styleguide_admin_only: "Az adminisztrátorokra korlátozza a stílusútmutató láthatóságát"
diff --git a/plugins/styleguide/config/locales/server.it.yml b/plugins/styleguide/config/locales/server.it.yml
index fefcb27ba2..f4c7a076a2 100644
--- a/plugins/styleguide/config/locales/server.it.yml
+++ b/plugins/styleguide/config/locales/server.it.yml
@@ -6,5 +6,5 @@
 
 it:
   site_settings:
-    styleguide_enabled: "Abilita un percorso `/styleguide` per aiutarti nella personalizzazione di Discourse"
+    styleguide_enabled: 'Abilita un percorso `/styleguide` per aiutarti nella personalizzazione di Discourse'
     styleguide_admin_only: "Limita la visibilità della guida di stile agli amministratori"
diff --git a/plugins/styleguide/config/locales/server.ja.yml b/plugins/styleguide/config/locales/server.ja.yml
index 0f8eefaedd..1f6d42568c 100644
--- a/plugins/styleguide/config/locales/server.ja.yml
+++ b/plugins/styleguide/config/locales/server.ja.yml
@@ -6,5 +6,5 @@
 
 ja:
   site_settings:
-    styleguide_enabled: "`/styleguide` のパスを有効にして、Discourse のスタイル設定に役立てる"
+    styleguide_enabled: '`/styleguide` のパスを有効にして、Discourse のスタイル設定に役立てる'
     styleguide_admin_only: "スタイルガイドの表示を管理者に制限する"
diff --git a/plugins/styleguide/config/locales/server.ko.yml b/plugins/styleguide/config/locales/server.ko.yml
index 5e44c122b1..c17003e07e 100644
--- a/plugins/styleguide/config/locales/server.ko.yml
+++ b/plugins/styleguide/config/locales/server.ko.yml
@@ -6,5 +6,5 @@
 
 ko:
   site_settings:
-    styleguide_enabled: "Discourse 스타일링에 도움이되는`/ styleguide` 경로 활성화"
+    styleguide_enabled: 'Discourse 스타일링에 도움이되는`/ styleguide` 경로 활성화'
     styleguide_admin_only: "스타일 가이드의 접근을 관리자로 제한합니다."
diff --git a/plugins/styleguide/config/locales/server.nl.yml b/plugins/styleguide/config/locales/server.nl.yml
index 0586c43a02..7a22fa649b 100644
--- a/plugins/styleguide/config/locales/server.nl.yml
+++ b/plugins/styleguide/config/locales/server.nl.yml
@@ -6,5 +6,5 @@
 
 nl:
   site_settings:
-    styleguide_enabled: "Een '/styleguide'-pad voor hulp bij het vormgeven van Discourse inschakelen"
+    styleguide_enabled: 'Een ''/styleguide''-pad voor hulp bij het vormgeven van Discourse inschakelen'
     styleguide_admin_only: "Beperkt de zichtbaarheid van de stijlgids tot beheerders"
diff --git a/plugins/styleguide/config/locales/server.pl_PL.yml b/plugins/styleguide/config/locales/server.pl_PL.yml
index d99fac507d..37fa213cea 100644
--- a/plugins/styleguide/config/locales/server.pl_PL.yml
+++ b/plugins/styleguide/config/locales/server.pl_PL.yml
@@ -6,5 +6,5 @@
 
 pl_PL:
   site_settings:
-    styleguide_enabled: "Włącz ścieżkę `/styleguide`, aby pomóc w stylizowaniu Discourse"
+    styleguide_enabled: 'Włącz ścieżkę `/styleguide`, aby pomóc w stylizowaniu Discourse'
     styleguide_admin_only: "Ogranicza widoczność styleguide dla administratorów"
diff --git a/plugins/styleguide/config/locales/server.pt.yml b/plugins/styleguide/config/locales/server.pt.yml
index 600258334a..7635891861 100644
--- a/plugins/styleguide/config/locales/server.pt.yml
+++ b/plugins/styleguide/config/locales/server.pt.yml
@@ -6,5 +6,5 @@
 
 pt:
   site_settings:
-    styleguide_enabled: "Ativa um caminho `/styleguide` para ajudar no estilo do Discourse"
+    styleguide_enabled: 'Ativa um caminho `/styleguide` para ajudar no estilo do Discourse'
     styleguide_admin_only: "Limita a visibilidade do guia de estilo aos administradores"
diff --git a/plugins/styleguide/config/locales/server.pt_BR.yml b/plugins/styleguide/config/locales/server.pt_BR.yml
index 5e7b84ce1b..44e84051b7 100644
--- a/plugins/styleguide/config/locales/server.pt_BR.yml
+++ b/plugins/styleguide/config/locales/server.pt_BR.yml
@@ -5,3 +5,6 @@
 # https://translate.discourse.org/
 
 pt_BR:
+  site_settings:
+    styleguide_enabled: 'Ativar um caminho "/styleguide" para ajudar a estilizar o Discourse'
+    styleguide_admin_only: "Limita a visibilidade do guia de estilo de administradores(as)"
diff --git a/plugins/styleguide/config/locales/server.ro.yml b/plugins/styleguide/config/locales/server.ro.yml
index 7387efc934..428666fca5 100644
--- a/plugins/styleguide/config/locales/server.ro.yml
+++ b/plugins/styleguide/config/locales/server.ro.yml
@@ -6,5 +6,5 @@
 
 ro:
   site_settings:
-    styleguide_enabled: "Activează o cale `/styleguide` pentru a ajuta la personalizarea Discourse"
+    styleguide_enabled: 'Activează o cale `/styleguide` pentru a ajuta la personalizarea Discourse'
     styleguide_admin_only: "Limitează vizibilitatea ghidului de stil la administratori"
diff --git a/plugins/styleguide/config/locales/server.ru.yml b/plugins/styleguide/config/locales/server.ru.yml
index 9be6c0be5c..caaaaa3c05 100644
--- a/plugins/styleguide/config/locales/server.ru.yml
+++ b/plugins/styleguide/config/locales/server.ru.yml
@@ -6,5 +6,5 @@
 
 ru:
   site_settings:
-    styleguide_enabled: "Включить путь `/ styleguide` для упрощения применения стилей в Discourse"
+    styleguide_enabled: 'Включить путь `/styleguide`, чтобы облегчить стилизацию Discourse'
     styleguide_admin_only: "Ограничить видимость styleguide только администраторами"
diff --git a/plugins/styleguide/config/locales/server.sv.yml b/plugins/styleguide/config/locales/server.sv.yml
index 13ef3be4b1..d0ef1a6614 100644
--- a/plugins/styleguide/config/locales/server.sv.yml
+++ b/plugins/styleguide/config/locales/server.sv.yml
@@ -6,5 +6,5 @@
 
 sv:
   site_settings:
-    styleguide_enabled: "Aktivera en `/styleguide`-sökväg för att underlätta Discourse-stilar"
+    styleguide_enabled: 'Aktivera en `/styleguide`-sökväg för att underlätta Discourse-stilar'
     styleguide_admin_only: "Begränsar stilguidens synlighet till administratörer"
diff --git a/plugins/styleguide/config/locales/server.tr_TR.yml b/plugins/styleguide/config/locales/server.tr_TR.yml
index fefe048212..054591b537 100644
--- a/plugins/styleguide/config/locales/server.tr_TR.yml
+++ b/plugins/styleguide/config/locales/server.tr_TR.yml
@@ -6,5 +6,5 @@
 
 tr_TR:
   site_settings:
-    styleguide_enabled: "Söylemin stiline yardımcı olması için bir \"/ stil kılavuzu\" yolunu etkinleştir"
+    styleguide_enabled: 'Söylemin stiline yardımcı olması için bir "/ stil kılavuzu" yolunu etkinleştir'
     styleguide_admin_only: "Stil kılavuzunun görünürlüğünü yöneticilerle sınırla"
diff --git a/plugins/styleguide/config/locales/server.uk.yml b/plugins/styleguide/config/locales/server.uk.yml
index c3e1381a57..279ca8ea15 100644
--- a/plugins/styleguide/config/locales/server.uk.yml
+++ b/plugins/styleguide/config/locales/server.uk.yml
@@ -6,5 +6,5 @@
 
 uk:
   site_settings:
-    styleguide_enabled: "Увімкнути шлях `/styleguide`, щоб спростити стилізацію Discourse"
+    styleguide_enabled: 'Увімкнути шлях `/styleguide`, щоб спростити стилізацію Discourse'
     styleguide_admin_only: "Обмежує видимість керування стилем лише адміністраторами"
diff --git a/plugins/styleguide/config/locales/server.ur.yml b/plugins/styleguide/config/locales/server.ur.yml
index 5234d21f7d..1db2dc577b 100644
--- a/plugins/styleguide/config/locales/server.ur.yml
+++ b/plugins/styleguide/config/locales/server.ur.yml
@@ -6,5 +6,5 @@
 
 ur:
   site_settings:
-    styleguide_enabled: "ڈسکورس اسٹائل میں معاونت کے`/اسٹائل گائڈ` کی راہ کو فعال کریں"
+    styleguide_enabled: 'ڈسکورس اسٹائل میں معاونت کے`/اسٹائل گائڈ` کی راہ کو فعال کریں'
     styleguide_admin_only: "اسٹائل گائڈ کو صرف منتظمین تک محدود کریں"
diff --git a/plugins/styleguide/config/locales/server.vi.yml b/plugins/styleguide/config/locales/server.vi.yml
index 57202febc4..9b46e1feb3 100644
--- a/plugins/styleguide/config/locales/server.vi.yml
+++ b/plugins/styleguide/config/locales/server.vi.yml
@@ -6,5 +6,5 @@
 
 vi:
   site_settings:
-    styleguide_enabled: "Bật đường dẫn `/styleguide` để hỗ trợ việc tạo kiểu của Discourse"
+    styleguide_enabled: 'Bật đường dẫn `/styleguide` để hỗ trợ việc tạo kiểu của Discourse'
     styleguide_admin_only: "Giới hạn khả năng hiển thị của styleguide đối với quản trị viên"
diff --git a/plugins/styleguide/config/locales/server.zh_CN.yml b/plugins/styleguide/config/locales/server.zh_CN.yml
index 17c49611ed..8421b0462e 100644
--- a/plugins/styleguide/config/locales/server.zh_CN.yml
+++ b/plugins/styleguide/config/locales/server.zh_CN.yml
@@ -6,5 +6,5 @@
 
 zh_CN:
   site_settings:
-    styleguide_enabled: "启用 `/styleguide` 路径用于帮助理解 Discourse 样式"
-    styleguide_admin_only: "样式导引仅对管理员可见"
+    styleguide_enabled: '启用 `/styleguide` 路径以帮助设置 Discourse 的样式'
+    styleguide_admin_only: "将样式指南的公开范围限制为管理员"
diff --git a/public/403.zh_CN.html b/public/403.zh_CN.html
index 33715c7946..b13346fffd 100644
--- a/public/403.zh_CN.html
+++ b/public/403.zh_CN.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>你不可以这样做 (403)</title>
+  <title>您不可以这样做 (403)</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <style type="text/css">
     body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
@@ -20,9 +20,9 @@
 <body>
   <div class="dialog">
     <h1>403</h1>
-    <p>你不能查看这个资源！</p>
+    <p>您无法查看该资源！</p>
 
-    <p>该页面将被自定义的403页面取代。</p>
+    <p>这将被自定义 Discourse 403 页面取代。</p>
   </div>
 </body>
 </html>
diff --git a/public/422.pt_BR.html b/public/422.pt_BR.html
index 1dd6b6bb29..d71db5ca2c 100644
--- a/public/422.pt_BR.html
+++ b/public/422.pt_BR.html
@@ -21,7 +21,7 @@
   <!-- This file lives in public/422.html -->
   <div class="dialog">
     <h1>A alteração que você solicitou foi rejeitada.</h1>
-    <p>Talvez você tenha tentado alterar algo que você não tinha acesso.</p>
+    <p>Talvez você tenha tentado alterar algo a que você não tinha acesso.</p>
   </div>
 </body>
 </html>
diff --git a/public/422.zh_CN.html b/public/422.zh_CN.html
index 1872fb2a36..c791eae678 100644
--- a/public/422.zh_CN.html
+++ b/public/422.zh_CN.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>你的更改操作被拒绝  (422)</title>
+  <title>您想要的更改被拒绝 (422)</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <style type="text/css">
     body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
@@ -20,8 +20,8 @@
 <body>
   <!-- This file lives in public/422.html -->
   <div class="dialog">
-    <h1>你的更改操作被拒绝。</h1>
-    <p>也许你在试图更改一些你无权访问的内容。</p>
+    <h1>您想要的更改被拒绝。</h1>
+    <p>也许您试图更改一些您无权访问的内容。</p>
   </div>
 </body>
 </html>
diff --git a/public/500.bg.html b/public/500.bg.html
index c22502737c..6e558c463a 100644
--- a/public/500.bg.html
+++ b/public/500.bg.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Oops - Error 500</title>
+  <title>Ами сега - Грешка 500</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>Oops</h1>
-    <p>The software powering this discussion forum encountered an unexpected problem. We apologize for the inconvenience.</p>
-    <p>Detailed information about the error was logged, and an automatic notification generated. We'll take a look at it.</p>
-    <p>No further action is necessary. However, if the error condition persists, you can provide additional detail, including steps to reproduce the error, by posting a discussion topic in the site's feedback category.</p>
+    <h1>Ами сега</h1>
+    <p>Софтуерът, задвижващ този дискусионен форум, срещна неочакван проблем. Извиняваме се за причиненото неудобството.</p>
+    <p>Записана е подробна информация за грешката и е генерирано автоматично известие. Ще го разгледаме.</p>
+    <p>Не са необходими допълнителни действия. Ако условието за грешка продължава да се показва, можете да предоставите допълнителни подробности, включително и стъпки за възпроизвеждане на грешката, като публикувате тема за дискусия в категорията за обратна връзка на сайта.</p>
 </body>
 </html>
diff --git a/public/500.pt_BR.html b/public/500.pt_BR.html
index 1948dd3406..018f23a4e8 100644
--- a/public/500.pt_BR.html
+++ b/public/500.pt_BR.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Ops - Erro 500</title>
+  <title>Ops, erro 500</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>Opa</h1>
-    <p>O software por trás desse fórum de discussões encontrou um problema inesperado. Pedimos desculpas pelo inconveniente.</p>
-    <p>Informações detalhadas sobre esse erro foram registradas e uma notificação automática foi gerada. Iremos dar uma atenção a esse ponto.</p>
+    <h1>Ops</h1>
+    <p>O software por trás deste fórum de discussões teve um problema inesperado. Pedimos desculpas pelo inconveniente.</p>
+    <p>Informações detalhadas sobre este erro foram registradas e uma notificação automática foi gerada. Iremos analisar isto.</p>
     <p>Nenhuma ação adicional de sua parte é necessária. Entretanto, se a condição de erro persistir, você pode nos fornecer detalhes adicionais, incluindo as etapas para conseguirmos reproduzir esse erro, postando um novo tópico na categoria de comentários da comunidade.</p>
 </body>
 </html>
diff --git a/public/500.zh_CN.html b/public/500.zh_CN.html
index 666f8c4e5a..4cf0e7af36 100644
--- a/public/500.zh_CN.html
+++ b/public/500.zh_CN.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>糟糕 - 500错误</title>
+  <title>糟糕 - 错误 500</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
     <h1>糟糕</h1>
-    <p>为此论坛提供支持的软件遇到了意外的问题。 对于给你带来的不便，我们深表歉意。</p>
-    <p>有关错误的详细信息已被记录，并自动生成了通知。 我们会看看它。</p>
-    <p>你无需采取进一步的行动。 但是，如果错误持续出现，你可以通过在站点的反馈分类中创建主题来告诉我们，同时，请提供重现该错误的详细步骤以及尽可能多的有效信息。</p>
+    <p>支持此论坛的软件遇到了意外问题。 对于任何不便之处，我们深表歉意。</p>
+    <p>已记录有关错误的详细信息，并生成自动通知。 我们会进行调查。</p>
+    <p>您无需采取更多操作。 但是，如果错误情况仍然存在，您可以通过在网站的反馈类别中发布讨论话题来提供更多详细信息，包括重现错误的步骤。</p>
 </body>
 </html>
diff --git a/public/503.bg.html b/public/503.bg.html
index 56ccbd948b..4f9176ffc9 100644
--- a/public/503.bg.html
+++ b/public/503.bg.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Site Is Undergoing Maintenance</title>
+  <title>Сайтът е в процес на поддръжка</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
diff --git a/public/503.pt_BR.html b/public/503.pt_BR.html
index ba778aa73e..b7a61ae2cb 100644
--- a/public/503.pt_BR.html
+++ b/public/503.pt_BR.html
@@ -5,7 +5,7 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>Estamos fora do ar para uma manutenção programada</h1>
+    <h1>Estamos fora do ar para uma manutenção programada do site</h1>
     <p>Por favor verifique novamente <span id="when-to-check-back">em alguns minutos</span>.</p>
     <p id="apology">Desculpe pelo inconveniente!</p>
 </body>
diff --git a/public/503.zh_CN.html b/public/503.zh_CN.html
index 69d68045ab..8cd23b484c 100644
--- a/public/503.zh_CN.html
+++ b/public/503.zh_CN.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>站点正在维护中</title>
+  <title>网站正在进行维护</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>我们当前正在进行计划中维护操作。</h1>
-    <p>请<span id="when-to-check-back">过几分钟</span>后再回来</p>
-    <p id="apology">很抱歉给你带来不便！</p>
+    <h1>我们当前正在进行计划的网站维护。</h1>
+    <p>请<span id="when-to-check-back">在几分钟后</span>回来查看。</p>
+    <p id="apology">对于任何不便之处，我们深表歉意！</p>
 </body>
 </html>

From 265e32e3e2a5bf20187a0f998b49ac1cf53cb57d Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 21 Jul 2021 10:40:35 +0200
Subject: [PATCH 54/77] DEV: uses main instead of master in version_bump script
 (#13805)

---
 script/version_bump.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/version_bump.rb b/script/version_bump.rb
index 5ee5c60b2f..057cdacf86 100755
--- a/script/version_bump.rb
+++ b/script/version_bump.rb
@@ -84,7 +84,7 @@ end
 if ARGV.include?('push')
   puts "Pushing..."
 
-  `git push origin master`
+  `git push origin main`
   `git push origin v#{version}`
   `git push origin latest-release`
 end

From d9faae483d23637a057abc36bef1b66ac519ce03 Mon Sep 17 00:00:00 2001
From: Andrei Prigorshnev <a.prigorshnev@gmail.com>
Date: Wed, 21 Jul 2021 15:28:47 +0400
Subject: [PATCH 55/77] FIX: Consider 100 years suspension as permanent
 (instead of 500-years suspension) (#13808)

That'll be consistent with recent changes in https://github.com/discourse/discourse/pull/13776
---
 app/assets/javascripts/discourse/app/models/user.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/models/user.js b/app/assets/javascripts/discourse/app/models/user.js
index 4b2b4e905f..fc28a3b31f 100644
--- a/app/assets/javascripts/discourse/app/models/user.js
+++ b/app/assets/javascripts/discourse/app/models/user.js
@@ -37,7 +37,7 @@ export const SECOND_FACTOR_METHODS = {
   SECURITY_KEY: 3,
 };
 
-const isForever = (dt) => moment().diff(dt, "years") < -500;
+const isForever = (dt) => moment().diff(dt, "years") < -100;
 
 let userFields = [
   "bio_raw",

From 4da0a33524b54fdd65a1f279506f8ac42b3091d8 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Wed, 21 Jul 2021 14:41:04 +0300
Subject: [PATCH 56/77] FIX: Allow only groups with flairs to be selected
 (#13744)

It used the same permission check as for primary groups which is
wrong because not all groups that can be primary have a flair.
---
 app/services/user_updater.rb     |  2 +-
 lib/guardian.rb                  |  6 ++++++
 spec/components/guardian_spec.rb | 27 +++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/app/services/user_updater.rb b/app/services/user_updater.rb
index 1192419727..adb2cc6dba 100644
--- a/app/services/user_updater.rb
+++ b/app/services/user_updater.rb
@@ -124,7 +124,7 @@ class UserUpdater
     if attributes[:flair_group_id] &&
       attributes[:flair_group_id] != user.flair_group_id &&
       (attributes[:flair_group_id].blank? ||
-        guardian.can_use_primary_group?(user, attributes[:flair_group_id]))
+        guardian.can_use_flair_group?(user, attributes[:flair_group_id]))
 
       user.flair_group_id = attributes[:flair_group_id]
     end
diff --git a/lib/guardian.rb b/lib/guardian.rb
index 33ef954c7c..54822b95b9 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -323,6 +323,12 @@ class Guardian
     (group ? !group.automatic : false)
   end
 
+  def can_use_flair_group?(user, group_id = nil)
+    return false if !user || !group_id || !user.group_ids.include?(group_id.to_i)
+    flair_icon, flair_upload_id = Group.where(id: group_id.to_i).pluck_first(:flair_icon, :flair_upload_id)
+    flair_icon.present? || flair_upload_id.present?
+  end
+
   def can_change_primary_group?(user)
     user && is_staff?
   end
diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb
index 2d49dfc92c..e07f63f5e8 100644
--- a/spec/components/guardian_spec.rb
+++ b/spec/components/guardian_spec.rb
@@ -2692,6 +2692,33 @@ describe Guardian do
     end
   end
 
+  describe 'can_use_flair_group?' do
+    fab!(:group) { Fabricate(:group, title: 'Groupie', flair_icon: 'icon') }
+
+    it 'is false without a logged in user' do
+      expect(Guardian.new(nil).can_use_flair_group?(user)).to eq(false)
+    end
+
+    it 'is false if the group does not exist' do
+      expect(Guardian.new(user).can_use_flair_group?(user, nil)).to eq(false)
+      expect(Guardian.new(user).can_use_flair_group?(user, Group.last.id + 1)).to eq(false)
+    end
+
+    it 'is false if the user is not a part of the group' do
+      expect(Guardian.new(user).can_use_flair_group?(user, group.id)).to eq(false)
+    end
+
+    it 'is false if the group does not have a flair' do
+      group.update(flair_icon: nil)
+      expect(Guardian.new(user).can_use_flair_group?(user, group.id)).to eq(false)
+    end
+
+    it 'is true if the user is a part of the group and the group has a flair' do
+      user.update(groups: [group])
+      expect(Guardian.new(user).can_use_flair_group?(user, group.id)).to eq(true)
+    end
+  end
+
   describe 'can_change_trust_level?' do
 
     it 'is false without a logged in user' do

From 519528daa2cdeeec18bc507698ac3dbe6856f51c Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 21 Jul 2021 13:49:21 +0200
Subject: [PATCH 57/77] FIX: allows to use icon-picker in wizard (#13786)

- inlines dasherize helper in sk
- uses an ajax helper to load wizard's ajax lib when in wizard
- amends wizard's ajax lib to work with string as first arg
- disabled loading spinner in wizard as it's not available
---
 .../select-kit/addon/components/icon-picker.js        |  2 +-
 .../addon/components/select-kit/select-kit-row.js     |  4 ++++
 .../javascripts/select-kit/addon/lib/ajax-helper.js   |  8 ++++++++
 .../javascripts/select-kit/addon/mixins/tags.js       |  2 +-
 .../addon/templates/components/multi-select.hbs       |  4 +++-
 .../components/select-kit/select-kit-row.hbs          |  2 +-
 app/assets/javascripts/wizard/lib/ajax.js             | 11 ++++++++++-
 7 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 app/assets/javascripts/select-kit/addon/lib/ajax-helper.js

diff --git a/app/assets/javascripts/select-kit/addon/components/icon-picker.js b/app/assets/javascripts/select-kit/addon/components/icon-picker.js
index 69b7767b1d..6d506ab64d 100644
--- a/app/assets/javascripts/select-kit/addon/components/icon-picker.js
+++ b/app/assets/javascripts/select-kit/addon/components/icon-picker.js
@@ -4,10 +4,10 @@ import {
   enableMissingIconWarning,
 } from "discourse-common/lib/icon-library";
 import MultiSelectComponent from "select-kit/components/multi-select";
-import { ajax } from "discourse/lib/ajax";
 import { computed } from "@ember/object";
 import { isDevelopment } from "discourse-common/config/environment";
 import { makeArray } from "discourse-common/lib/helpers";
+import { ajax } from "select-kit/lib/ajax-helper";
 
 export default MultiSelectComponent.extend({
   pluginApiIdentifiers: ["icon-picker"],
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-row.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-row.js
index 26f8b810bb..9e8b734e55 100644
--- a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-row.js
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-row.js
@@ -69,6 +69,10 @@ export default Component.extend(UtilsMixin, {
     );
   }),
 
+  dasherizedTitle: computed("title", function () {
+    return (this.title || "").replace(".", "-").dasherize();
+  }),
+
   label: computed("rowLabel", "item.label", "title", "rowName", function () {
     const label =
       this.rowLabel ||
diff --git a/app/assets/javascripts/select-kit/addon/lib/ajax-helper.js b/app/assets/javascripts/select-kit/addon/lib/ajax-helper.js
new file mode 100644
index 0000000000..4cd5d97ece
--- /dev/null
+++ b/app/assets/javascripts/select-kit/addon/lib/ajax-helper.js
@@ -0,0 +1,8 @@
+let ajax;
+if (window.Discourse) {
+  ajax = requirejs("discourse/lib/ajax").ajax;
+} else {
+  ajax = requirejs("wizard/lib/ajax").ajax;
+}
+
+export { ajax };
diff --git a/app/assets/javascripts/select-kit/addon/mixins/tags.js b/app/assets/javascripts/select-kit/addon/mixins/tags.js
index 400e921dfc..fa3dfabd7e 100644
--- a/app/assets/javascripts/select-kit/addon/mixins/tags.js
+++ b/app/assets/javascripts/select-kit/addon/mixins/tags.js
@@ -1,6 +1,6 @@
 import I18n from "I18n";
 import Mixin from "@ember/object/mixin";
-import { ajax } from "discourse/lib/ajax";
+import { ajax } from "select-kit/lib/ajax-helper";
 import getURL from "discourse-common/lib/get-url";
 import { isEmpty } from "@ember/utils";
 import { makeArray } from "discourse-common/lib/helpers";
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/multi-select.hbs b/app/assets/javascripts/select-kit/addon/templates/components/multi-select.hbs
index 8672c07bec..8f68a91b5e 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/multi-select.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/multi-select.hbs
@@ -10,7 +10,9 @@
   {{#select-kit/select-kit-body selectKit=selectKit id=(concat selectKit.uniqueID "-body")}}
     {{#if selectKit.isLoading}}
       <span class="is-loading">
-        {{loading-spinner size="small"}}
+        {{#if site}}
+          {{loading-spinner size="small"}}
+        {{/if}}
       </span>
     {{else}}
       {{#if selectKit.filter}}
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-row.hbs
index b27647f8b4..e3e3dcbe1c 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-row.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-row.hbs
@@ -1,5 +1,5 @@
 {{#each icons as |icon|}}
-  {{d-icon icon translatedtitle=(dasherize title)}}
+  {{d-icon icon translatedtitle=dasherizedTitle}}
 {{/each}}
 
 <span class="name">
diff --git a/app/assets/javascripts/wizard/lib/ajax.js b/app/assets/javascripts/wizard/lib/ajax.js
index ec0dd1c5cd..670747e807 100644
--- a/app/assets/javascripts/wizard/lib/ajax.js
+++ b/app/assets/javascripts/wizard/lib/ajax.js
@@ -14,11 +14,20 @@ export function getToken() {
 }
 
 export function ajax(args) {
+  let url;
+
+  if (arguments.length === 2) {
+    url = arguments[0];
+    args = arguments[1];
+  } else {
+    url = args.url;
+  }
+
   return new Promise((resolve, reject) => {
     args.headers = { "X-CSRF-Token": getToken() };
     args.success = (data) => run(null, resolve, data);
     args.error = (xhr) => run(null, reject, xhr);
-    args.url = getUrl(args.url);
+    args.url = getUrl(url);
     jQuery.ajax(args);
   });
 }

From 2ce2c83bc9a9cc971f0a47994c4a3db92731122c Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Wed, 21 Jul 2021 09:14:53 -0400
Subject: [PATCH 58/77] FIX: Show user filter hints when typing `@` in search 
 (#13799)

Will show the last 6 seen users as filtering suggestions when typing @ in quick search. (Previously the user suggestion required a character after the @.)

This also adds a default limit of 6 to the user search query, previously the backend was returning 20 results but a maximum of 6 results was being shown anyway.
---
 .../discourse/app/lib/user-search.js          | 23 ++++++++--
 .../discourse/app/widgets/search-menu.js      | 22 ++++++----
 .../discourse/tests/acceptance/search-test.js | 44 +++++++++++++++++++
 app/controllers/users_controller.rb           |  2 +
 app/models/user_search.rb                     | 10 +++++
 spec/models/user_search_spec.rb               |  9 ++++
 spec/requests/users_controller_spec.rb        | 18 ++++++++
 7 files changed, 116 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/lib/user-search.js b/app/assets/javascripts/discourse/app/lib/user-search.js
index 0f14ca40b4..79b3c5800b 100644
--- a/app/assets/javascripts/discourse/app/lib/user-search.js
+++ b/app/assets/javascripts/discourse/app/lib/user-search.js
@@ -22,6 +22,8 @@ function performSearch(
   allowedUsers,
   groupMembersOf,
   includeStagedUsers,
+  lastSeenUsers,
+  limit,
   resultsFn
 ) {
   let cached = cache[term];
@@ -32,7 +34,7 @@ function performSearch(
 
   const eagerComplete = eagerCompleteSearch(term, topicId || categoryId);
 
-  if (term === "" && !eagerComplete) {
+  if (term === "" && !eagerComplete && !lastSeenUsers) {
     // The server returns no results in this case, so no point checking
     // do not return empty list, because autocomplete will get terminated
     resultsFn(CANCELLED_STATUS);
@@ -51,6 +53,8 @@ function performSearch(
       groups: groupMembersOf,
       topic_allowed_users: allowedUsers,
       include_staged_users: includeStagedUsers,
+      last_seen_users: lastSeenUsers,
+      limit: limit,
     },
   });
 
@@ -93,6 +97,8 @@ let debouncedSearch = function (
   allowedUsers,
   groupMembersOf,
   includeStagedUsers,
+  lastSeenUsers,
+  limit,
   resultsFn
 ) {
   discourseDebounce(
@@ -107,6 +113,8 @@ let debouncedSearch = function (
     allowedUsers,
     groupMembersOf,
     includeStagedUsers,
+    lastSeenUsers,
+    limit,
     resultsFn,
     300
   );
@@ -169,7 +177,10 @@ function organizeResults(r, options) {
 // we also ignore if we notice a double space or a string that is only a space
 const ignoreRegex = /([\u2000-\u206F\u2E00-\u2E7F\\'!"#$%&()*,\/:;<=>?\[\]^`{|}~])|\s\s|^\s$|^[^+]*\+[^@]*$/;
 
-export function skipSearch(term, allowEmails) {
+export function skipSearch(term, allowEmails, lastSeenUsers = false) {
+  if (lastSeenUsers) {
+    return false;
+  }
   if (term.indexOf("@") > -1 && !allowEmails) {
     return true;
   }
@@ -194,7 +205,9 @@ export default function userSearch(options) {
     topicId = options.topicId,
     categoryId = options.categoryId,
     groupMembersOf = options.groupMembersOf,
-    includeStagedUsers = options.includeStagedUsers;
+    includeStagedUsers = options.includeStagedUsers,
+    lastSeenUsers = options.lastSeenUsers,
+    limit = options.limit || 6;
 
   if (oldSearch) {
     oldSearch.abort();
@@ -217,7 +230,7 @@ export default function userSearch(options) {
       clearPromise = later(() => resolve(CANCELLED_STATUS), 5000);
     }
 
-    if (skipSearch(term, options.allowEmails)) {
+    if (skipSearch(term, options.allowEmails, options.lastSeenUsers)) {
       resolve([]);
       return;
     }
@@ -232,6 +245,8 @@ export default function userSearch(options) {
       allowedUsers,
       groupMembersOf,
       includeStagedUsers,
+      lastSeenUsers,
+      limit,
       function (r) {
         cancel(clearPromise);
         resolve(organizeResults(r, options));
diff --git a/app/assets/javascripts/discourse/app/widgets/search-menu.js b/app/assets/javascripts/discourse/app/widgets/search-menu.js
index 2ea06cdab6..d91628cee5 100644
--- a/app/assets/javascripts/discourse/app/widgets/search-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/search-menu.js
@@ -10,9 +10,7 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
 import userSearch from "discourse/lib/user-search";
 
 const CATEGORY_SLUG_REGEXP = /(\#[a-zA-Z0-9\-:]*)$/gi;
-// The backend user search query returns zero results for a term-free search
-// so the regexp below only matches @ followed by a valid character
-const USERNAME_REGEXP = /(\@[a-zA-Z0-9\-\_]+)$/gi;
+const USERNAME_REGEXP = /(\@[a-zA-Z0-9\-\_]*)$/gi;
 
 const searchData = {};
 const suggestionTriggers = ["in:", "status:", "order:"];
@@ -72,11 +70,19 @@ const SearchHelper = {
           return;
         }
         if (matchSuggestions.type === "username") {
-          userSearch({
-            term: matchSuggestions.usernamesMatch[0],
-            includeGroups: true,
-          }).then((result) => {
-            if (result?.users.length > 0) {
+          const userSearchTerm = matchSuggestions.usernamesMatch[0].replace(
+            "@",
+            ""
+          );
+          const opts = { includeGroups: true, limit: 6 };
+          if (userSearchTerm.length > 0) {
+            opts.term = userSearchTerm;
+          } else {
+            opts.lastSeenUsers = true;
+          }
+
+          userSearch(opts).then((result) => {
+            if (result?.users?.length > 0) {
               searchData.suggestionResults = result.users;
               searchData.suggestionKeyword = "@";
             } else {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/search-test.js b/app/assets/javascripts/discourse/tests/acceptance/search-test.js
index 64224c8cee..2342d2d339 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/search-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/search-test.js
@@ -268,6 +268,33 @@ acceptance("Search - with tagging enabled", function (needs) {
 acceptance("Search - assistant", function (needs) {
   needs.user();
 
+  needs.pretender((server, helper) => {
+    server.get("/u/search/users", () => {
+      return helper.response({
+        users: [
+          {
+            username: "TeaMoe",
+            name: "TeaMoe",
+            avatar_template:
+              "https://avatars.discourse.org/v3/letter/t/41988e/{size}.png",
+          },
+          {
+            username: "TeamOneJ",
+            name: "J Cobb",
+            avatar_template:
+              "https://avatars.discourse.org/v3/letter/t/3d9bf3/{size}.png",
+          },
+          {
+            username: "kudos",
+            name: "Team Blogeto.com",
+            avatar_template:
+              "/user_avatar/meta.discourse.org/kudos/{size}/62185_1.png",
+          },
+        ],
+      });
+    });
+  });
+
   test("shows category shortcuts when typing #", async function (assert) {
     await visit("/");
 
@@ -317,4 +344,21 @@ acceptance("Search - assistant", function (needs) {
     await triggerKeyEvent("#search-term", "keyup", 51);
     assert.equal(query(firstTarget).innerText, "sam in:title");
   });
+
+  test("shows users when typing @", async function (assert) {
+    await visit("/");
+
+    await click("#search-button");
+
+    await fillIn("#search-term", "@");
+    await triggerKeyEvent("#search-term", "keyup", 51);
+
+    const firstUser =
+      ".search-menu .results ul.search-menu-assistant .search-item-user";
+    const firstUsername = query(firstUser).innerText.trim();
+    assert.equal(firstUsername, "TeaMoe");
+
+    await click(query(firstUser));
+    assert.equal(query("#search-term").value, `@${firstUsername} `);
+  });
 });
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 8e77c49090..725694f2b6 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1079,6 +1079,8 @@ class UsersController < ApplicationController
     }
 
     options[:include_staged_users] = !!ActiveModel::Type::Boolean.new.cast(params[:include_staged_users])
+    options[:last_seen_users] = !!ActiveModel::Type::Boolean.new.cast(params[:last_seen_users])
+    options[:limit] = params[:limit].to_i if params[:limit].present?
     options[:topic_id] = topic_id if topic_id
     options[:category_id] = category_id if category_id
 
diff --git a/app/models/user_search.rb b/app/models/user_search.rb
index 13d74df069..ba53653594 100644
--- a/app/models/user_search.rb
+++ b/app/models/user_search.rb
@@ -12,6 +12,7 @@ class UserSearch
     @topic_allowed_users = opts[:topic_allowed_users]
     @searching_user = opts[:searching_user]
     @include_staged_users = opts[:include_staged_users] || false
+    @last_seen_users = opts[:last_seen_users] || false
     @limit = opts[:limit] || 20
     @groups = opts[:groups]
 
@@ -162,6 +163,15 @@ class UserSearch
         .each { |id| users << id }
     end
 
+    # 5. last seen users (for search auto-suggestions)
+    if @last_seen_users
+      scoped_users
+        .order('last_seen_at DESC NULLS LAST')
+        .limit(@limit - users.size)
+        .pluck(:id)
+        .each { |id| users << id }
+    end
+
     users.to_a
   end
 
diff --git a/spec/models/user_search_spec.rb b/spec/models/user_search_spec.rb
index c72abc8468..e9d1a6ac3e 100644
--- a/spec/models/user_search_spec.rb
+++ b/spec/models/user_search_spec.rb
@@ -238,5 +238,14 @@ describe UserSearch do
       results = search_for("", topic_id: topic.id, searching_user: mr_b)
       expect(results).to eq [mr_pink, mr_orange].map(&:username)
     end
+
+    it "works with last_seen_users option" do
+      results = search_for("", last_seen_users: true)
+
+      expect(results).not_to be_blank
+      expect(results[0]).to eq("mrbrown")
+      expect(results[1]).to eq("mrpink")
+      expect(results[2]).to eq("mrorange")
+    end
   end
 end
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 57c414ec28..5fa9eb0a71 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -4022,6 +4022,24 @@ describe UsersController do
         expect(json["users"].map { |u| u["name"] }).not_to include(staged_user.name)
       end
     end
+
+    context '`last_seen_users`' do
+      it "returns results when the param is true" do
+        get "/u/search/users.json", params: { last_seen_users: true }
+
+        json = response.parsed_body
+        expect(json["users"]).not_to be_empty
+      end
+
+      it "respects limit parameter at the same time" do
+        limit = 3
+        get "/u/search/users.json", params: { last_seen_users: true, limit: limit }
+
+        json = response.parsed_body
+        expect(json["users"]).not_to be_empty
+        expect(json["users"].size).to eq(limit)
+      end
+    end
   end
 
   describe '#email_login' do

From a10fd95a7e9843d59420220b77cae6a55ac687ae Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 21 Jul 2021 16:35:24 +0200
Subject: [PATCH 59/77] DEV: removes unused version_bump script (#13811)

---
 script/version_bump.rb | 92 ------------------------------------------
 1 file changed, 92 deletions(-)
 delete mode 100755 script/version_bump.rb

diff --git a/script/version_bump.rb b/script/version_bump.rb
deleted file mode 100755
index 057cdacf86..0000000000
--- a/script/version_bump.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# Increases the version. e.g., from 0.8.5 to 0.8.6.
-# If you want to bump the minor or major version numbers, do it manually
-# or edit lib/version.rb before running this file.
-
-usage = <<-END
-
-   Arguments:
-     <version>: The new version. Must have at least 2 parts. Examples: 0.9.8, 0.10, 0.9.7.3
-     no-commit: Don't commit the changes.
-     push:      Push the commits to github. If used by itself without the version argument,
-                it's assumed that the commit and tags are ready to be pushed.
-
-  Example:
-
-    To update the version in one step, and then push the commits in a second step:
-
-      ruby script/version_bump.rb 0.9.7.3
-      ruby script/version_bump.rb push
-
-    To do everything in one step:
-
-      ruby script/version_bump.rb 0.9.8 push
-
-  END
-
-VERSION_FILE_PATH = File.expand_path('../../lib/version.rb',  __FILE__)
-
-if ARGV.length < 1
-  puts usage
-  exit 1
-end
-
-new_version = ARGV[0].split('.')
-if new_version.length < (2) && !ARGV.include?('push')
-  puts "First argument must be a version number with at least 2 parts. Examples: 0.9.8, 0.10, 0.9.7.3"
-  exit 1
-end
-
-update_version_file = new_version.length >= 2
-
-if update_version_file
-  puts '', "New Version: #{new_version.join('.')}", "Updating #{VERSION_FILE_PATH}..."
-
-  contents = ''
-  tiny_version_bumped = false
-  File.open(VERSION_FILE_PATH) do |f|
-    contents = f.read
-    ['MAJOR', 'MINOR', 'TINY', 'PRE'].each_with_index do |name, i|
-      r = Regexp.new(name + '\s*=\s*(nil|[\d]+)')
-      m = r.match(contents)
-      v = new_version[i].to_i > 0 ? new_version[i] : (name == 'PRE' ? 'nil' : '0')
-      contents.sub!(m[0], m[0].sub(m[1], v)) if m
-    end
-  end
-
-  puts "Saving..."
-
-  File.open(VERSION_FILE_PATH, 'w+') do |f|
-    f.write(contents)
-  end
-end
-
-require File.expand_path('../../lib/version',  __FILE__)
-
-version = Discourse::VERSION::STRING
-puts "New version is: #{version}"
-
-unless ARGV.include?('no-commit') || !update_version_file
-  puts "Committing..."
-
-  `git add lib/version.rb`
-  `git commit -m "Version bump to v#{version}"`
-  sha = `git rev-parse HEAD`.strip
-  `git tag -d latest-release`
-  `git push origin :latest-release`
-  `git tag -a v#{version} -m "version #{version}" #{sha}`
-  `git tag -a latest-release -m "latest release" #{sha}`
-end
-
-if ARGV.include?('push')
-  puts "Pushing..."
-
-  `git push origin main`
-  `git push origin v#{version}`
-  `git push origin latest-release`
-end
-
-puts "Done", ''

From aa6daeaa3e70710c0c7c5d153b79731505cfcff0 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Wed, 21 Jul 2021 10:41:04 -0400
Subject: [PATCH 60/77] FEATURE: New style for personal messages (#13800)

---
 .../discourse/app/widgets/embedded-post.js    |   2 +-
 .../javascripts/discourse/app/widgets/post.js |   3 +
 app/assets/stylesheets/color_definitions.scss |   1 +
 .../stylesheets/common/base/_index.scss       |   1 +
 .../common/base/personal-message.scss         | 156 ++++++++++++++++++
 .../stylesheets/common/base/topic-post.scss   |  48 +++++-
 .../foundation/color_transformations.scss     |   1 +
 .../stylesheets/desktop/topic-post.scss       |   6 -
 app/assets/stylesheets/mobile/_index.scss     |   1 +
 .../stylesheets/mobile/personal-message.scss  |  58 +++++++
 app/assets/stylesheets/mobile/topic-post.scss |  16 +-
 11 files changed, 274 insertions(+), 19 deletions(-)
 create mode 100644 app/assets/stylesheets/common/base/personal-message.scss
 create mode 100644 app/assets/stylesheets/mobile/personal-message.scss

diff --git a/app/assets/javascripts/discourse/app/widgets/embedded-post.js b/app/assets/javascripts/discourse/app/widgets/embedded-post.js
index 2be773dcaf..e5192f4486 100644
--- a/app/assets/javascripts/discourse/app/widgets/embedded-post.js
+++ b/app/assets/javascripts/discourse/app/widgets/embedded-post.js
@@ -30,7 +30,7 @@ export default createWidget("embedded-post", {
         h("div.row", [
           this.attach("post-avatar", attrs),
           h("div.topic-body", [
-            h("div.topic-meta-data", [
+            h("div.topic-meta-data.embedded-reply", [
               this.attach("poster-name", attrs),
               this.attach("post-link-arrow", {
                 above: state.above,
diff --git a/app/assets/javascripts/discourse/app/widgets/post.js b/app/assets/javascripts/discourse/app/widgets/post.js
index 1021ecf76c..866eb76dda 100644
--- a/app/assets/javascripts/discourse/app/widgets/post.js
+++ b/app/assets/javascripts/discourse/app/widgets/post.js
@@ -755,6 +755,9 @@ export default createWidget("post", {
     if (attrs.topicOwner) {
       classNames.push("topic-owner");
     }
+    if (attrs.user_id === this.currentUser.id) {
+      classNames.push("current-user-post");
+    }
     if (attrs.groupModerator) {
       classNames.push("category-moderator");
     }
diff --git a/app/assets/stylesheets/color_definitions.scss b/app/assets/stylesheets/color_definitions.scss
index 9e4174e47a..2990ac7e71 100644
--- a/app/assets/stylesheets/color_definitions.scss
+++ b/app/assets/stylesheets/color_definitions.scss
@@ -41,6 +41,7 @@
   --secondary-high: #{$secondary-high};
   --secondary-very-high: #{$secondary-very-high};
 
+  --tertiary-very-low: #{$tertiary-very-low};
   --tertiary-low: #{$tertiary-low};
   --tertiary-medium: #{$tertiary-medium};
   --tertiary-high: #{$tertiary-high};
diff --git a/app/assets/stylesheets/common/base/_index.scss b/app/assets/stylesheets/common/base/_index.scss
index 4ef29d0a97..7572adc88b 100644
--- a/app/assets/stylesheets/common/base/_index.scss
+++ b/app/assets/stylesheets/common/base/_index.scss
@@ -33,6 +33,7 @@
 @import "modal";
 @import "not-found";
 @import "onebox";
+@import "personal-message";
 @import "popup-menu";
 @import "redirection";
 @import "request_access";
diff --git a/app/assets/stylesheets/common/base/personal-message.scss b/app/assets/stylesheets/common/base/personal-message.scss
new file mode 100644
index 0000000000..a1dc0de11f
--- /dev/null
+++ b/app/assets/stylesheets/common/base/personal-message.scss
@@ -0,0 +1,156 @@
+.archetype-private_message {
+  --border-radius: 2em;
+
+  @keyframes current-user-background-fade-highlight {
+    0% {
+      background-color: var(--secondary);
+      border-color: var(--primary-low);
+    }
+    100% {
+      background-color: var(--tertiary-very-low);
+      border-color: transparent;
+    }
+  }
+
+  .topic-body .cooked {
+    box-sizing: border-box;
+    border: 1px solid var(--primary-low);
+    margin-top: 0.25em;
+    margin-left: -1.35em;
+    padding: 1.5em 1.5em 0.5em 2em;
+    border-radius: 0 var(--border-radius) var(--border-radius)
+      var(--border-radius);
+  }
+
+  .current-user-post {
+    .topic-body .cooked {
+      border: 1px solid transparent;
+      background: var(--tertiary-very-low);
+    }
+    .topic-body.highlighted {
+      .cooked {
+        animation: current-user-background-fade-highlight 2.5s ease-out;
+      }
+    }
+    .embedded-posts {
+      .topic-body .cooked {
+        border: 1px solid var(--primary-low);
+        background: transparent;
+      }
+    }
+  }
+
+  .moderator {
+    .topic-body .cooked {
+      border: 1px solid transparent;
+    }
+  }
+
+  .deleted .topic-body {
+    .cooked {
+      background: var(--danger-low);
+    }
+  }
+
+  .whisper {
+    .topic-body .cooked {
+      background: transparent;
+      border: 2px dashed var(--primary-low);
+    }
+
+    &.my-post .topic-body .cooked {
+      border: 2px dashed var(--tertiary-very-low);
+    }
+  }
+
+  .topic-body.highlighted {
+    animation: none;
+    .cooked {
+      animation: background-fade-highlight 2.5s ease-out;
+    }
+  }
+
+  .topic-avatar,
+  .topic-body {
+    border: none;
+  }
+
+  .post-menu-area {
+    margin-top: 0.5em;
+  }
+
+  .small-action-desc.timegap {
+    flex: 0 0 auto;
+    padding: 0 1em;
+    margin-top: -1.75em;
+    margin-left: -1em;
+    background: var(--secondary);
+    max-width: calc(758px - 1.5em);
+  }
+
+  .post-notice {
+    margin-bottom: 1em;
+    border: none;
+    background: var(--primary-very-low);
+    border-radius: var(--border-radius);
+    margin-left: 1.5em;
+    box-sizing: border-box;
+    padding: 1.5em 2em;
+  }
+
+  .topic-map {
+    margin-left: -1.5em;
+    border: none;
+    border-radius: var(--border-radius);
+    padding: 1.25em;
+
+    section {
+      border: none;
+    }
+    .map:not(.map-collapsed) {
+      .avatars {
+        margin: 0.5em 0;
+      }
+    }
+
+    .participants {
+      margin-bottom: 1.5em;
+      .user {
+        border: none;
+        background: var(--primary-low);
+        padding: 2px 4px;
+        border-radius: var(--border-radius);
+      }
+    }
+  }
+
+  .map:first-of-type .buttons .btn {
+    border: none;
+    border-radius: var(--border-radius);
+  }
+
+  .embedded-posts {
+    border: none;
+    .topic-body {
+      overflow: visible;
+    }
+    .topic-body,
+    .topic-avatar {
+      border: none !important; // overrides some specificity for .bottom
+    }
+    .collapse-down,
+    .collapse-up {
+      display: none;
+    }
+  }
+
+  .timeline-replies {
+    display: flex;
+    align-items: baseline;
+    margin-right: 0.15em;
+  }
+
+  .gap {
+    margin-bottom: 2em;
+  }
+}
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 3238f3eb9a..def3ebb001 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -206,7 +206,6 @@ $quote-share-maxwidth: 150px;
 .moderator {
   .regular > .cooked {
     background-color: var(--highlight-low-or-medium);
-    padding: 10px;
   }
   .clearfix > .topic-meta-data > .names {
     span.user-title {
@@ -235,6 +234,53 @@ $quote-share-maxwidth: 150px;
   }
 }
 
+.deleted {
+  .regular > .cooked {
+    background-color: var(--danger-low-mid);
+  }
+  .topic-meta-data:not(.embedded-reply) {
+    color: var(--danger);
+
+    .post-info a,
+    a {
+      color: currentColor;
+    }
+
+    .d-icon {
+      color: currentColor;
+    }
+  }
+  nav.post-controls {
+    color: var(--danger);
+
+    .show-replies,
+    button.reply.create {
+      color: var(--danger);
+      .d-icon {
+        color: var(--danger);
+      }
+    }
+    .widget-button {
+      &:hover {
+        color: currentColor;
+        background: var(--danger-low);
+        .d-icon {
+          color: currentColor;
+        }
+      }
+      &.fade-out {
+        opacity: 1;
+      }
+    }
+    .d-icon {
+      color: var(--danger);
+    }
+  }
+  .post-action {
+    color: var(--danger);
+  }
+}
+
 // we use aside to hold expandable quotes (versus, say, static blockquotes)
 aside.quote {
   margin-top: 1em;
diff --git a/app/assets/stylesheets/common/foundation/color_transformations.scss b/app/assets/stylesheets/common/foundation/color_transformations.scss
index 4b1261d170..ca43415a87 100644
--- a/app/assets/stylesheets/common/foundation/color_transformations.scss
+++ b/app/assets/stylesheets/common/foundation/color_transformations.scss
@@ -23,6 +23,7 @@ $secondary-high: dark-light-diff($secondary, $primary, 30%, -35%) !default;
 $secondary-very-high: dark-light-diff($secondary, $primary, 7%, -7%) !default;
 
 //tertiary
+$tertiary-very-low: dark-light-diff($tertiary, $secondary, 90%, -75%) !default;
 $tertiary-low: dark-light-diff($tertiary, $secondary, 85%, -65%) !default;
 $tertiary-medium: dark-light-diff($tertiary, $secondary, 50%, -45%) !default;
 $tertiary-high: dark-light-diff($tertiary, $secondary, 20%, -25%) !default;
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 7b29f7b285..6ff674301c 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -523,12 +523,6 @@ video {
   position: relative;
 }
 
-.deleted {
-  .topic-body {
-    background-color: var(--danger-low-mid);
-  }
-}
-
 .post-select {
   float: right;
   margin-right: 20px;
diff --git a/app/assets/stylesheets/mobile/_index.scss b/app/assets/stylesheets/mobile/_index.scss
index 7d5fcaa7da..6d3cf8a313 100644
--- a/app/assets/stylesheets/mobile/_index.scss
+++ b/app/assets/stylesheets/mobile/_index.scss
@@ -21,6 +21,7 @@
 @import "login";
 @import "menu-panel";
 @import "modal";
+@import "personal-message";
 @import "push-notifications-mobile";
 @import "reviewables";
 @import "ring";
diff --git a/app/assets/stylesheets/mobile/personal-message.scss b/app/assets/stylesheets/mobile/personal-message.scss
new file mode 100644
index 0000000000..d193ed5c96
--- /dev/null
+++ b/app/assets/stylesheets/mobile/personal-message.scss
@@ -0,0 +1,58 @@
+.archetype-private_message {
+  .topic-body .cooked {
+    margin-top: 0.5em;
+    margin-left: 0;
+    padding: 1.5em 1em;
+    border-radius: 0.75em var(--border-radius) var(--border-radius)
+      var(--border-radius);
+  }
+  .topic-avatar {
+    margin-bottom: -1em; // creates bubble overlap
+  }
+  .boxed .contents {
+    padding: 0;
+  }
+
+  .topic-post {
+    margin: 0 0 1em;
+    article {
+      border-top: none;
+    }
+  }
+
+  .topic-body {
+    flex: 1 1 auto;
+  }
+
+  .topic-map {
+    padding: 1em 0.5em;
+    margin-left: 0;
+  }
+
+  .post-notice {
+    padding: 1em;
+    margin: 0 0 1em;
+    width: 100%;
+  }
+
+  .small-action {
+    margin-left: 0;
+  }
+
+  .small-action-desc.timegap {
+    margin-left: 0;
+    padding: 1em 1em 1em 0;
+  }
+
+  .small-action:not(.time-gap) {
+    padding: 1em;
+  }
+
+  .topic-meta-data .names .first.staff {
+    flex-basis: 100%;
+    & + .second,
+    & + .second + .user-title {
+      flex-basis: unset;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 78ad0a6d53..ebfe9441a4 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -87,11 +87,7 @@ span.badge-posts {
         &.expand-post {
           margin: 10px 0 10px 0;
         }
-        &.reply {
-          .d-icon {
-            color: var(--primary-high);
-          }
-        }
+
         &.has-like {
           .d-icon {
             color: var(--love);
@@ -126,6 +122,10 @@ span.badge-posts {
   }
 }
 
+nav.post-controls button.reply .d-icon {
+  color: var(--primary-high);
+}
+
 .post-admin-menu {
   bottom: -50px;
   left: 135px;
@@ -337,12 +337,6 @@ button.select-post {
   display: inline-block;
 }
 
-.deleted {
-  .topic-body {
-    background-color: var(--danger-low-mid);
-  }
-}
-
 .deleted-user-avatar {
   font-size: $font-up-5;
 }

From da81cfe317229f3491eaa36bad346c949dcecd8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Wed, 21 Jul 2021 17:21:04 +0200
Subject: [PATCH 61/77] Fixed a typo in the 'same_site_cookies' site setting
 description (#13809)

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

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index b00d9832e8..6e787d7265 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1548,7 +1548,7 @@ en:
     detailed_404: "Provides more details to users about why they can’t access a particular topic. Note: This is less secure because users will know if a URL links to a valid topic."
     enforce_second_factor: "Forces users to enable two-factor authentication. Select 'all' to enforce it to all users. Select 'staff' to enforce it to staff users only."
     force_https: "Force your site to use HTTPS only. WARNING: do NOT enable this until you verify HTTPS is fully set up and working absolutely everywhere! Did you check your CDN, all social logins, and any external logos / dependencies to make sure they are all HTTPS compatible, too?"
-    same_site_cookies: "Use same site cookies, they eliminate all vectors Cross Site Request Forgery on supported browsers (Lax or Strict). Warning: Strict will only work on sites that force login and use an external auth method."
+    same_site_cookies: "Use same site cookies, they eliminate all Cross Site Request Forgery vectors on supported browsers (Lax or Strict). Warning: Strict will only work on sites that force login and use an external auth method."
     summary_score_threshold: "The minimum score required for a post to be included in 'Summarize This Topic'"
     summary_posts_required: "Minimum posts in a topic before 'Summarize This Topic' is enabled. Changes to this setting will be applied retroactively within a week."
     summary_likes_required: "Minimum likes in a topic before 'Summarize This Topic' is enabled. Changes to this setting will be applied retroactively within a week."

From 5ebae8a64df84ddb0365a4710ffdb48f6c5921e7 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Wed, 21 Jul 2021 12:26:28 -0400
Subject: [PATCH 62/77] need to check if currentUser exists (#13814)

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

diff --git a/app/assets/javascripts/discourse/app/widgets/post.js b/app/assets/javascripts/discourse/app/widgets/post.js
index 866eb76dda..a184f91a8f 100644
--- a/app/assets/javascripts/discourse/app/widgets/post.js
+++ b/app/assets/javascripts/discourse/app/widgets/post.js
@@ -755,7 +755,7 @@ export default createWidget("post", {
     if (attrs.topicOwner) {
       classNames.push("topic-owner");
     }
-    if (attrs.user_id === this.currentUser.id) {
+    if (this.currentUser && attrs.user_id === this.currentUser.id) {
       classNames.push("current-user-post");
     }
     if (attrs.groupModerator) {

From 4f328089d6f9366d8a1b5cad31766ebc0e0926dc Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 19 Jul 2021 14:59:32 -0400
Subject: [PATCH 63/77] FIX: Force timeline/progress to re-insert into DOM on
 topic change

We have CSS animations which depend on the timeline/progress being
completely cleared when navigating from one topic directly to another.
This always worked because our loading component would clear the entire page
between topics but with our new experimental loading component the DOM was being
re-used.

This patch ensures that the timeline is removed completely from the DOM
if the topic changes.
---
 .../discourse/app/components/topic-navigation.js  | 15 ++++++++++++++-
 .../app/templates/components/topic-navigation.hbs |  4 +++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/topic-navigation.js b/app/assets/javascripts/discourse/app/components/topic-navigation.js
index 93d39a2660..77d1dee893 100644
--- a/app/assets/javascripts/discourse/app/components/topic-navigation.js
+++ b/app/assets/javascripts/discourse/app/components/topic-navigation.js
@@ -5,7 +5,7 @@ import PanEvents, {
 import Component from "@ember/component";
 import EmberObject from "@ember/object";
 import discourseDebounce from "discourse-common/lib/debounce";
-import { later } from "@ember/runloop";
+import { later, next } from "@ember/runloop";
 import { observes } from "discourse-common/utils/decorators";
 import showModal from "discourse/lib/show-modal";
 
@@ -16,12 +16,23 @@ export default Component.extend(PanEvents, {
   composerOpen: null,
   info: null,
   isPanning: false,
+  canRender: true,
+  _lastTopicId: null,
 
   init() {
     this._super(...arguments);
     this.set("info", EmberObject.create());
   },
 
+  didUpdateAttrs() {
+    this._super(...arguments);
+    if (this._lastTopicId !== this.topic.id) {
+      this._lastTopicId = this.topic.id;
+      this.set("canRender", false);
+      next(() => this.set("canRender", true));
+    }
+  },
+
   _performCheckSize() {
     if (!this.element || this.isDestroying || this.isDestroyed) {
       return;
@@ -180,6 +191,8 @@ export default Component.extend(PanEvents, {
   didInsertElement() {
     this._super(...arguments);
 
+    this._lastTopicId = this.topic.id;
+
     this.appEvents
       .on("topic:current-post-scrolled", this, this._topicScrolled)
       .on("topic:jump-to-post", this, this._collapseFullscreen)
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-navigation.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-navigation.hbs
index 6491b3415a..98ec8b7552 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-navigation.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/topic-navigation.hbs
@@ -1 +1,3 @@
-{{yield info}}
+{{#if canRender}}
+  {{yield info}}
+{{/if}}

From 8a470e508e9a4134e1127d3c81b2fd53f06a1974 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Wed, 21 Jul 2021 14:00:27 -0400
Subject: [PATCH 64/77] UX: Improve quick search suggestions (#13813)

---
 .../discourse/app/lib/plugin-api.js           | 12 +--
 .../app/widgets/search-menu-results.js        | 59 ++++++-------
 .../discourse/app/widgets/search-menu.js      | 82 +++++++++----------
 .../discourse/tests/acceptance/search-test.js |  4 +
 lib/search.rb                                 |  2 +-
 5 files changed, 74 insertions(+), 85 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js
index cbf157d6cb..5ffbaff63b 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js
@@ -73,10 +73,10 @@ import { replaceFormatter } from "discourse/lib/utilities";
 import { replaceTagRenderer } from "discourse/lib/render-tag";
 import { setNewCategoryDefaultColors } from "discourse/routes/new-category";
 import { addSearchResultsCallback } from "discourse/lib/search";
-import { addInSearchShortcut } from "discourse/widgets/search-menu-results";
+import { addSearchSuggestion } from "discourse/widgets/search-menu-results";
 
 // If you add any methods to the API ensure you bump up this number
-const PLUGIN_API_VERSION = "0.11.6";
+const PLUGIN_API_VERSION = "0.11.7";
 
 class PluginApi {
   constructor(version, container) {
@@ -1298,15 +1298,15 @@ class PluginApi {
   }
 
   /**
-   * Add a in: shortcut to search menu panel.
+   * Add a suggestion shortcut to search menu panel.
    *
    * ```
-   * addInSearchShortcut("in:assigned");
+   * addSearchSuggestion("in:assigned");
    * ```
    *
    */
-  addInSearchShortcut(value) {
-    addInSearchShortcut(value);
+  addSearchSuggestion(value) {
+    addSearchSuggestion(value);
   }
 }
 
diff --git a/app/assets/javascripts/discourse/app/widgets/search-menu-results.js b/app/assets/javascripts/discourse/app/widgets/search-menu-results.js
index 5ef9d058c1..32457733eb 100644
--- a/app/assets/javascripts/discourse/app/widgets/search-menu-results.js
+++ b/app/assets/javascripts/discourse/app/widgets/search-menu-results.js
@@ -10,30 +10,22 @@ import highlightSearch from "discourse/lib/highlight-search";
 import { iconNode } from "discourse-common/lib/icon-library";
 import renderTag from "discourse/lib/render-tag";
 
-const inSearchShortcuts = [
+const suggestionShortcuts = [
   "in:title",
-  "in:personal",
-  "in:seen",
-  "in:likes",
-  "in:bookmarks",
-  "in:created",
-];
-const statusSearchShortcuts = [
+  "in:pinned",
   "status:open",
   "status:closed",
   "status:public",
   "status:noreplies",
-];
-const orderSearchShortcuts = [
   "order:latest",
   "order:views",
   "order:likes",
   "order:latest_topic",
 ];
 
-export function addInSearchShortcut(value) {
-  if (inSearchShortcuts.indexOf(value) === -1) {
-    inSearchShortcuts.push(value);
+export function addSearchSuggestion(value) {
+  if (suggestionShortcuts.indexOf(value) === -1) {
+    suggestionShortcuts.push(value);
   }
 }
 
@@ -360,8 +352,19 @@ createWidget("search-menu-assistant", {
   tagName: "ul.search-menu-assistant",
 
   html(attrs) {
+    if (this.currentUser) {
+      addSearchSuggestion("in:likes");
+      addSearchSuggestion("in:bookmarks");
+      addSearchSuggestion("in:mine");
+      addSearchSuggestion("in:personal");
+      addSearchSuggestion("in:seen");
+      addSearchSuggestion("in:tracking");
+      addSearchSuggestion("in:unseen");
+      addSearchSuggestion("in:watching");
+    }
     if (this.siteSettings.tagging_enabled) {
-      addInSearchShortcut("in:tagged");
+      addSearchSuggestion("in:tagged");
+      addSearchSuggestion("in:untagged");
     }
 
     const content = [];
@@ -370,7 +373,7 @@ createWidget("search-menu-assistant", {
 
     switch (suggestionKeyword) {
       case "#":
-        attrs.results.map((category) => {
+        attrs.results.forEach((category) => {
           const slug = prefix
             ? `${prefix} #${category.slug} `
             : `#${category.slug} `;
@@ -385,7 +388,7 @@ createWidget("search-menu-assistant", {
         });
         break;
       case "@":
-        attrs.results.map((user) => {
+        attrs.results.forEach((user) => {
           const slug = prefix
             ? `${prefix} @${user.username} `
             : `@${user.username} `;
@@ -399,27 +402,17 @@ createWidget("search-menu-assistant", {
           );
         });
         break;
-      case "in:":
-        inSearchShortcuts.map((item) => {
-          const slug = prefix ? `${prefix} ${item} ` : item;
-          content.push(this.attach("search-menu-assistant-item", { slug }));
-        });
-        break;
-      case "status:":
-        statusSearchShortcuts.map((item) => {
-          const slug = prefix ? `${prefix} ${item} ` : item;
-          content.push(this.attach("search-menu-assistant-item", { slug }));
-        });
-        break;
-      case "order:":
-        orderSearchShortcuts.map((item) => {
-          const slug = prefix ? `${prefix} ${item} ` : item;
-          content.push(this.attach("search-menu-assistant-item", { slug }));
+      default:
+        suggestionShortcuts.forEach((item) => {
+          if (item.includes(suggestionKeyword)) {
+            const slug = prefix ? `${prefix} ${item} ` : `${item} `;
+            content.push(this.attach("search-menu-assistant-item", { slug }));
+          }
         });
         break;
     }
 
-    return content;
+    return content.filter((c, i) => i <= 8);
   },
 });
 
diff --git a/app/assets/javascripts/discourse/app/widgets/search-menu.js b/app/assets/javascripts/discourse/app/widgets/search-menu.js
index d91628cee5..f34668e243 100644
--- a/app/assets/javascripts/discourse/app/widgets/search-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/search-menu.js
@@ -11,9 +11,9 @@ import userSearch from "discourse/lib/user-search";
 
 const CATEGORY_SLUG_REGEXP = /(\#[a-zA-Z0-9\-:]*)$/gi;
 const USERNAME_REGEXP = /(\@[a-zA-Z0-9\-\_]*)$/gi;
+const SUGGESTIONS_REGEXP = /(in:|status:|order:|:)([a-zA-Z]*)$/gi;
 
 const searchData = {};
-const suggestionTriggers = ["in:", "status:", "order:"];
 
 export function initSearchData() {
   searchData.loading = false;
@@ -53,47 +53,42 @@ const SearchHelper = {
       searchData.results = [];
       searchData.loading = false;
 
-      if (typeof matchSuggestions === "string") {
-        searchData.suggestionKeyword = matchSuggestions;
+      if (matchSuggestions.type === "category") {
+        const categorySearchTerm = matchSuggestions.categoriesMatch[0].replace(
+          "#",
+          ""
+        );
+
+        searchData.suggestionResults = Category.search(categorySearchTerm);
+        searchData.suggestionKeyword = "#";
         widget.scheduleRerender();
-        return;
-      } else {
-        if (matchSuggestions.type === "category") {
-          const categorySearchTerm = matchSuggestions.categoriesMatch[0].replace(
-            "#",
-            ""
-          );
-
-          searchData.suggestionResults = Category.search(categorySearchTerm);
-          searchData.suggestionKeyword = "#";
-          widget.scheduleRerender();
-          return;
+      } else if (matchSuggestions.type === "username") {
+        const userSearchTerm = matchSuggestions.usernamesMatch[0].replace(
+          "@",
+          ""
+        );
+        const opts = { includeGroups: true, limit: 6 };
+        if (userSearchTerm.length > 0) {
+          opts.term = userSearchTerm;
+        } else {
+          opts.lastSeenUsers = true;
         }
-        if (matchSuggestions.type === "username") {
-          const userSearchTerm = matchSuggestions.usernamesMatch[0].replace(
-            "@",
-            ""
-          );
-          const opts = { includeGroups: true, limit: 6 };
-          if (userSearchTerm.length > 0) {
-            opts.term = userSearchTerm;
+
+        userSearch(opts).then((result) => {
+          if (result?.users?.length > 0) {
+            searchData.suggestionResults = result.users;
+            searchData.suggestionKeyword = "@";
           } else {
-            opts.lastSeenUsers = true;
+            searchData.noResults = true;
+            searchData.suggestionKeyword = false;
           }
-
-          userSearch(opts).then((result) => {
-            if (result?.users?.length > 0) {
-              searchData.suggestionResults = result.users;
-              searchData.suggestionKeyword = "@";
-            } else {
-              searchData.noResults = true;
-              searchData.suggestionKeyword = false;
-            }
-            widget.scheduleRerender();
-          });
-          return;
-        }
+          widget.scheduleRerender();
+        });
+      } else {
+        searchData.suggestionKeyword = matchSuggestions[0];
+        widget.scheduleRerender();
       }
+      return;
     }
 
     searchData.suggestionKeyword = false;
@@ -142,14 +137,6 @@ const SearchHelper = {
       return false;
     }
 
-    const simpleSuggestion = suggestionTriggers.find(
-      (mod) => searchData.term === mod || searchData.term.endsWith(` ${mod}`)
-    );
-
-    if (simpleSuggestion) {
-      return simpleSuggestion;
-    }
-
     const categoriesMatch = searchData.term.match(CATEGORY_SLUG_REGEXP);
 
     if (categoriesMatch) {
@@ -161,6 +148,11 @@ const SearchHelper = {
       return { type: "username", usernamesMatch };
     }
 
+    const suggestionsMatch = searchData.term.match(SUGGESTIONS_REGEXP);
+    if (suggestionsMatch) {
+      return suggestionsMatch;
+    }
+
     return false;
   },
 };
diff --git a/app/assets/javascripts/discourse/tests/acceptance/search-test.js b/app/assets/javascripts/discourse/tests/acceptance/search-test.js
index 2342d2d339..982749a6c1 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/search-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/search-test.js
@@ -343,6 +343,10 @@ acceptance("Search - assistant", function (needs) {
     await fillIn("#search-term", "sam in:");
     await triggerKeyEvent("#search-term", "keyup", 51);
     assert.equal(query(firstTarget).innerText, "sam in:title");
+
+    await fillIn("#search-term", "in:pers");
+    await triggerKeyEvent("#search-term", "keyup", 51);
+    assert.equal(query(firstTarget).innerText, "in:personal");
   });
 
   test("shows users when typing @", async function (assert) {
diff --git a/lib/search.rb b/lib/search.rb
index 4efdbff9ca..0bf753df8f 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -452,7 +452,7 @@ class Search
     posts.where("posts.user_id = #{@guardian.user.id}") if @guardian.user
   end
 
-  advanced_filter(/^in:created$/i) do |posts|
+  advanced_filter(/^in:(created|mine)$/i) do |posts|
     posts.where(user_id: @guardian.user.id, post_number: 1) if @guardian.user
   end
 

From 78ab3f37b8a026c3aed62e31878b7c74eaa4e3d6 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 21 Jul 2021 12:35:56 -0400
Subject: [PATCH 65/77] FIX: Don't proxy `/qunit` URL when using Ember CLI

This is confusing because you're running the tests on the older version
of Ember. Use `/tests` for Ember CLI, and `/qunit` when using Rails'
asset pipeline (but only if REALLY necessary!)
---
 app/controllers/qunit_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/qunit_controller.rb b/app/controllers/qunit_controller.rb
index 98f7d70dac..26a1160cb1 100644
--- a/app/controllers/qunit_controller.rb
+++ b/app/controllers/qunit_controller.rb
@@ -10,6 +10,7 @@ class QunitController < ApplicationController
 
   # only used in test / dev
   def index
+    raise Discourse::NotFound.new if request.headers["HTTP_X_DISCOURSE_EMBER_CLI"] == "true"
     raise Discourse::InvalidAccess.new if Rails.env.production?
   end
 

From 5eb6e9281af4be97ff6aaa29e0091d1622cb3f21 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 21 Jul 2021 23:27:20 +0200
Subject: [PATCH 66/77] FIX: manually adds frowning_face_with_open_mouth for
 apple (#13528)

---
 .../pretty-text/addon/emoji/version.js           |   2 +-
 app/models/emoji.rb                              |   2 +-
 plugins/poll/spec/lib/pretty_text_spec.rb        |   4 ++--
 .../apple/frowning_face_with_open_mouth.png      | Bin 0 -> 1691 bytes
 spec/components/pretty_text_spec.rb              |  14 +++++++-------
 spec/lib/upload_security_spec.rb                 |   2 +-
 spec/models/upload_spec.rb                       |   2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 public/images/emoji/apple/frowning_face_with_open_mouth.png

diff --git a/app/assets/javascripts/pretty-text/addon/emoji/version.js b/app/assets/javascripts/pretty-text/addon/emoji/version.js
index a57796bd77..5b50dd5dec 100644
--- a/app/assets/javascripts/pretty-text/addon/emoji/version.js
+++ b/app/assets/javascripts/pretty-text/addon/emoji/version.js
@@ -1,4 +1,4 @@
 // DO NOT EDIT THIS FILE!!!
 // Update it by running `rake javascript:update_constants`
 
-export const IMAGE_VERSION = "9";
+export const IMAGE_VERSION = "10";
diff --git a/app/models/emoji.rb b/app/models/emoji.rb
index f755a7eaad..d9f8c06d19 100644
--- a/app/models/emoji.rb
+++ b/app/models/emoji.rb
@@ -2,7 +2,7 @@
 
 class Emoji
   # update this to clear the cache
-  EMOJI_VERSION = "9"
+  EMOJI_VERSION = "10"
 
   FITZPATRICK_SCALE ||= [ "1f3fb", "1f3fc", "1f3fd", "1f3fe", "1f3ff" ]
 
diff --git a/plugins/poll/spec/lib/pretty_text_spec.rb b/plugins/poll/spec/lib/pretty_text_spec.rb
index 52fed2284e..5770f804f3 100644
--- a/plugins/poll/spec/lib/pretty_text_spec.rb
+++ b/plugins/poll/spec/lib/pretty_text_spec.rb
@@ -165,7 +165,7 @@ describe PrettyText do
     MD
 
     expect(cooked).to include(<<~HTML)
-      <div class="poll-title">What’s your favorite <em>berry</em>? <img src="/images/emoji/twitter/wink.png?v=9" title=":wink:" class="emoji" alt=":wink:"> <a href="https://google.com/" rel="noopener nofollow ugc">https://google.com/</a>
+      <div class="poll-title">What’s your favorite <em>berry</em>? <img src="/images/emoji/twitter/wink.png?v=#{Emoji::EMOJI_VERSION}" title=":wink:" class="emoji" alt=":wink:"> <a href="https://google.com/" rel="noopener nofollow ugc">https://google.com/</a>
       </div>
     HTML
   end
@@ -185,7 +185,7 @@ describe PrettyText do
     MD
 
     expect(cooked).to include(<<~HTML)
-      <div class="poll-title">What’s your favorite <em>berry</em>? <img src="/images/emoji/twitter/wink.png?v=9" title=":wink:" class="emoji" alt=":wink:"> <a href="https://google.com/" rel="noopener nofollow ugc">https://google.com/</a>
+      <div class="poll-title">What’s your favorite <em>berry</em>? <img src="/images/emoji/twitter/wink.png?v=#{Emoji::EMOJI_VERSION}" title=":wink:" class="emoji" alt=":wink:"> <a href="https://google.com/" rel="noopener nofollow ugc">https://google.com/</a>
       </div>
     HTML
 
diff --git a/public/images/emoji/apple/frowning_face_with_open_mouth.png b/public/images/emoji/apple/frowning_face_with_open_mouth.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7ef74d9b3c34c5d0737d93e65c87e3caa93b10e
GIT binary patch
literal 1691
zcmV;M24wk(P)<h;3K|Lk000e1NJLTq002k;002k`0{{R3VlzW^00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#u24)=MMrQ<$Z87CcN_GS7|wz#^oj)Ae;dz;FV}-6
z(0?e&Z4Jd~3(0R1*L4u_l^^1M7MWKD|IRo6*E9dSDgWRy{<9nVs}=O46aT|Dq-P23
znh*cyJ>-xK|I01hg$UMn1ONQT|NOK6^H~4-q5tkk|HCZ*_jdpIk^lbQ|Mi6b_Ggt?
z27yNe|Ke24Yy<w*N&n_-{+a~;tOftT2WK$>;jt(G(hKB%0=9w}&y^r~t1Bh|000qm
zQchC<>4@Pj{hk$RNyOK(*}=s3Z7X|F000GUNkl<ZSi|MmXLqVf6b9fU7C=q1C@M&Z
zU4wv>$O-=cKX&)tQ)s4sJL_&!o$<*#g^Bv-&;Pa5fv#&<`ao5Gjp*9wu|J=&TJ#?k
zZSWgq)L+cr-u_ngHk<b!e`u-N<6=&V?d|v5?RM|kNTD_Q0i``=IWk^)+N@ux*6Urc
zwb9DIP3esBg3W8I*1OauO8L&jD@$bJ)B5#ZZ2}Xd?D5M`gAv9tgEb5WKAVAF@vcqk
zzvX#f`@-pi^EchBS-sY*wX9u?p+=uhPe0Ew&IW3Iui$R{z);yp{ltMh$!;U7rL1K`
z@Tnx6-L7NRj2+hIWPCh2m7LS=wBxnumS{Td0wd3}`!kN~Wt^yL7~a^&PAXLCA<u^T
zz5SEr`5}Nho!VNJL$sZsTRO|Les@3V!z{PbAPvZp8gZv4K?NO?{N6M@L7*f}fjS1k
zvCT0;AkYr|($u&!I1K_hY04z3;K;q8dN|yu(j#@n!96wifC_<T32RNy$7Tgb0kAqB
z&%CDtk+e>rLmbCxoNm)It7994dsw9iLEkvB+L4~JY?dTROx8BtZqFYUw#HlR87E0Q
z5-k}*NI^GI=NbsVZ0WONpk`V2RNsp@)zlC(sj|8y9F!a@tM4WC0Y>H+22oz@#e1mj
zzC+;M`xtK?%i}oCygoMl9U;d^fbvlC_8%8Ed(aCy8wNq6+L{eB3n0j3CN^}#z8^58
zBzBUR2092msMQoL=a%L8&}5osVuHmUv9ELdJ}BF^O>_+BV9m1OyDoPlL5BmAZ0zTo
z-rcf&pBRLE{{YZp_%0@C@Gx91W+3^#kCAM%a3i;{?>K%Lg{6;qOy&@zh`C;I2qhn+
zBDz8q7|r(hjmmVf!Now>6`eUiQ@Lo*09BG7UZXIA{&u?xY>2J}cNnyMAB#mpXkI}@
z6ooE4py)v5HFVwZT2>B0V%fBngboaX?jUs`m^y3_5KQ%Kv3RaQ?=sP$2Kn7Y2)R)s
z(Xs=Hv6&|Q;mE~Rt`JyEoBjkuHF+SKq6*SiFi9K|V+(O)CT$p-eTPrmbD;$S(b8AY
zxDJU)Ldh%K&@DXEWRE9<|5AowNo(fFxqg<*Kj;a_at;n`O5cWyk~tMcyBQi1&x9V}
zI2?LejpQl9Ad2Mp{F;MJZkVm2YY`a%VW5|l*xBlI^}-{;<qVX86gmxw?!Xpw92p28
z`7cS~5Jqyan1mMN_>GnC;PC+t1_Ef+lSia}p)E-gIdC*pRLwxfs2m<>EYG7suZm<j
zf)ZuQFT^v44XimuP<)bVQiJlVA0>kWW6q`aUt7C$B}O^Lt%Pk}7Ka)m2S(7O_8*du
ztt}bO&84FWD!f@j5e^TeG@cw)k!n%_=U4;<M+$ghQ8C;>sMmOkM3LH30S6phTX+(<
zaEV=`Tf^ajTF;P_6-GjdjSeUa4@y@SN`)8}<^iV@h$2<f#3;AnAaxC`gK+r3nlmJ3
ziA!vFi>T#brW-LV4?3$!=SieGzOZTHp{!fmp+i>0AqN88d4kLa$0eZdLoMg-Q+C*u
zB=O<F&|s}<g)4VsjBv*HUqmRCgu}bx%9rJhRapX5vgzSYXT{_+jcU?jZWRR_baeb$
z_ziz2hSnYO^z;v36O$xEvH6fSqpOSJusr%FudXYJQY|WGK?o?oe36IEQxEqOqnK5%
z<x<4CjK6wSt50|+qLxjBr9o%(_3P}xRD=?ktmkJQXQF-Yh5z_Msh9;C|Bhjh=_!M6
zzoS7ET2kW*Fe92}^}7@dkYT{#mlYzH-bDHFJ2nGtI=M8eH&*oDy@{minlc?vpvKdY
lq78oiRut2y{=s+S{sYLOk4{1xxcC47002ovPDHLkV1kyXF=zk)

literal 0
HcmV?d00001

diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb
index c2e5a611a5..cf9a2145c0 100644
--- a/spec/components/pretty_text_spec.rb
+++ b/spec/components/pretty_text_spec.rb
@@ -159,13 +159,13 @@ describe PrettyText do
 
           html = <<~HTML
             <blockquote>
-            <p>This is a quote with a regular emoji <img src="https://emoji.cdn.com/twitter/upside_down_face.png?v=9" title=":upside_down_face:" class="emoji" alt=":upside_down_face:"></p>
+            <p>This is a quote with a regular emoji <img src="https://emoji.cdn.com/twitter/upside_down_face.png?v=#{Emoji::EMOJI_VERSION}" title=":upside_down_face:" class="emoji" alt=":upside_down_face:"></p>
             </blockquote>
             <blockquote>
-            <p>This is a quote with an emoji shortcut <img src="https://emoji.cdn.com/twitter/slight_smile.png?v=9" title=":slight_smile:" class="emoji" alt=":slight_smile:"></p>
+            <p>This is a quote with an emoji shortcut <img src="https://emoji.cdn.com/twitter/slight_smile.png?v=#{Emoji::EMOJI_VERSION}" title=":slight_smile:" class="emoji" alt=":slight_smile:"></p>
             </blockquote>
             <blockquote>
-            <p>This is a quote with a Unicode emoji <img src="https://emoji.cdn.com/twitter/sunglasses.png?v=9" title=":sunglasses:" class="emoji" alt=":sunglasses:"></p>
+            <p>This is a quote with a Unicode emoji <img src="https://emoji.cdn.com/twitter/sunglasses.png?v=#{Emoji::EMOJI_VERSION}" title=":sunglasses:" class="emoji" alt=":sunglasses:"></p>
             </blockquote>
           HTML
 
@@ -180,13 +180,13 @@ describe PrettyText do
 
           html = <<~HTML
             <blockquote>
-            <p>This is a quote with a regular emoji <img src="https://emoji.cdn.com/twitter/upside_down_face.png?v=9" title=":upside_down_face:" class="emoji" alt=":upside_down_face:"></p>
+            <p>This is a quote with a regular emoji <img src="https://emoji.cdn.com/twitter/upside_down_face.png?v=#{Emoji::EMOJI_VERSION}" title=":upside_down_face:" class="emoji" alt=":upside_down_face:"></p>
             </blockquote>
             <blockquote>
-            <p>This is a quote with an emoji shortcut <img src="https://emoji.cdn.com/twitter/slight_smile.png?v=9" title=":slight_smile:" class="emoji" alt=":slight_smile:"></p>
+            <p>This is a quote with an emoji shortcut <img src="https://emoji.cdn.com/twitter/slight_smile.png?v=#{Emoji::EMOJI_VERSION}" title=":slight_smile:" class="emoji" alt=":slight_smile:"></p>
             </blockquote>
             <blockquote>
-            <p>This is a quote with a Unicode emoji <img src="https://emoji.cdn.com/twitter/sunglasses.png?v=9" title=":sunglasses:" class="emoji" alt=":sunglasses:"></p>
+            <p>This is a quote with a Unicode emoji <img src="https://emoji.cdn.com/twitter/sunglasses.png?v=#{Emoji::EMOJI_VERSION}" title=":sunglasses:" class="emoji" alt=":sunglasses:"></p>
             </blockquote>
           HTML
 
@@ -680,7 +680,7 @@ describe PrettyText do
     context "emojis" do
       it "should remove broken emoji" do
         html = <<~EOS
-          <img src=\"//localhost:3000/images/emoji/twitter/bike.png?v=9\" title=\":bike:\" class=\"emoji\" alt=\":bike:\"> <img src=\"//localhost:3000/images/emoji/twitter/cat.png?v=9\" title=\":cat:\" class=\"emoji\" alt=\":cat:\"> <img src=\"//localhost:3000/images/emoji/twitter/discourse.png?v=9\" title=\":discourse:\" class=\"emoji\" alt=\":discourse:\">
+          <img src=\"//localhost:3000/images/emoji/twitter/bike.png?v=#{Emoji::EMOJI_VERSION}\" title=\":bike:\" class=\"emoji\" alt=\":bike:\"> <img src=\"//localhost:3000/images/emoji/twitter/cat.png?v=#{Emoji::EMOJI_VERSION}\" title=\":cat:\" class=\"emoji\" alt=\":cat:\"> <img src=\"//localhost:3000/images/emoji/twitter/discourse.png?v=#{Emoji::EMOJI_VERSION}\" title=\":discourse:\" class=\"emoji\" alt=\":discourse:\">
         EOS
         expect(PrettyText.excerpt(html, 7)).to eq(":bike: &hellip;")
         expect(PrettyText.excerpt(html, 8)).to eq(":bike: &hellip;")
diff --git a/spec/lib/upload_security_spec.rb b/spec/lib/upload_security_spec.rb
index 32ed9ead8f..4b5cac7904 100644
--- a/spec/lib/upload_security_spec.rb
+++ b/spec/lib/upload_security_spec.rb
@@ -120,7 +120,7 @@ RSpec.describe UploadSecurity do
 
         describe "when it is based on a regular emoji" do
           it "returns false" do
-            falafel = Emoji.all.find { |e| e.url == '/images/emoji/twitter/falafel.png?v=9' }
+            falafel = Emoji.all.find { |e| e.url == "/images/emoji/twitter/falafel.png?v=#{Emoji::EMOJI_VERSION}" }
             upload.update!(origin: "http://localhost:3000#{falafel.url}")
             expect(subject.should_be_secure?).to eq(false)
           end
diff --git a/spec/models/upload_spec.rb b/spec/models/upload_spec.rb
index c614b28f5d..b4ad89a66f 100644
--- a/spec/models/upload_spec.rb
+++ b/spec/models/upload_spec.rb
@@ -466,7 +466,7 @@ describe Upload do
 
       it 'does not mark an upload whose origin matches a regular emoji as secure (sometimes emojis are downloaded in pull_hotlinked_images)' do
         SiteSetting.login_required = true
-        falafel = Emoji.all.find { |e| e.url == '/images/emoji/twitter/falafel.png?v=9' }
+        falafel = Emoji.all.find { |e| e.url == "/images/emoji/twitter/falafel.png?v=#{Emoji::EMOJI_VERSION}" }
         upload.update!(secure: false, origin: "http://localhost:3000#{falafel.url}")
         upload.update_secure_status
         expect(upload.reload.secure).to eq(false)

From c191194046199b46eb52a8146717c9c7d3cdf2e4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Jul 2021 22:06:09 +0000
Subject: [PATCH 67/77] Build(deps-dev): Bump listen from 3.5.1 to 3.6.0

Bumps [listen](https://github.com/guard/listen) from 3.5.1 to 3.6.0.
- [Release notes](https://github.com/guard/listen/releases)
- [Commits](https://github.com/guard/listen/compare/v3.5.1...v3.6.0)

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index e1a9665ad8..5aad34b4e8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -200,7 +200,7 @@ GEM
     libv8-node (15.14.0.1-x86_64-darwin-19)
     libv8-node (15.14.0.1-x86_64-darwin-20)
     libv8-node (15.14.0.1-x86_64-linux)
-    listen (3.5.1)
+    listen (3.6.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     literate_randomizer (0.4.0)

From 09d23a37a547b3a18f1d35d2aeca510456453c92 Mon Sep 17 00:00:00 2001
From: jbrw <jamie@goatforce5.org>
Date: Thu, 22 Jul 2021 01:49:59 -0400
Subject: [PATCH 68/77] DEV: Add default `Accept-Language` to FinalDestination
 requests (#13817)

Not specifying an `Accept-Language` should be equivalent to specifying an `Accept-Language` of `*`, however some webservers seem to prefer it if we are explicit about being able to handle a response of content in any language.
---
 lib/final_destination.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/final_destination.rb b/lib/final_destination.rb
index 2cc9b5c305..d2a8b03b5d 100644
--- a/lib/final_destination.rb
+++ b/lib/final_destination.rb
@@ -89,6 +89,7 @@ class FinalDestination
     result = {
       "User-Agent" => @user_agent,
       "Accept" => "*/*",
+      "Accept-Language" => "*",
       "Host" => @uri.hostname
     }
 

From f41908ad5b589edfbe27700ec15c5954ae45149f Mon Sep 17 00:00:00 2001
From: Martin Brennan <mjrbrennan@gmail.com>
Date: Thu, 22 Jul 2021 16:31:53 +1000
Subject: [PATCH 69/77] SECURITY: Validate period param for top topic routes
 (#13818)

Fixes a possible SQL injection vector
---
 lib/topic_query.rb                    |  4 ++++
 spec/components/topic_query_spec.rb   | 18 ++++++++++++++++++
 spec/requests/list_controller_spec.rb |  5 +++++
 3 files changed, 27 insertions(+)

diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index 12e759a22c..122a344d64 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -266,6 +266,10 @@ class TopicQuery
   end
 
   def list_top_for(period)
+    if !TopTopic.periods.include?(period.to_sym)
+      raise Discourse::InvalidParameters.new("Invalid period. Valid periods are #{TopTopic.periods.join(", ")}")
+    end
+
     score = "#{period}_score"
     create_list(:top, unordered: true) do |topics|
       topics = remove_muted_categories(topics, @user)
diff --git a/spec/components/topic_query_spec.rb b/spec/components/topic_query_spec.rb
index 041f519cd6..b4cc1efa27 100644
--- a/spec/components/topic_query_spec.rb
+++ b/spec/components/topic_query_spec.rb
@@ -355,6 +355,24 @@ describe TopicQuery do
     end
   end
 
+  context "#list_top_for" do
+    it "lists top for the week" do
+      Fabricate(:topic, like_count: 1000, posts_count: 100)
+      TopTopic.refresh!
+      expect(topic_query.list_top_for(:weekly).topics.count).to eq(1)
+    end
+
+    it "only allows periods defined by TopTopic.periods" do
+      expect { topic_query.list_top_for(:all) }.not_to raise_error
+      expect { topic_query.list_top_for(:yearly) }.not_to raise_error
+      expect { topic_query.list_top_for(:quarterly) }.not_to raise_error
+      expect { topic_query.list_top_for(:monthly) }.not_to raise_error
+      expect { topic_query.list_top_for(:weekly) }.not_to raise_error
+      expect { topic_query.list_top_for(:daily) }.not_to raise_error
+      expect { topic_query.list_top_for("some bad input") }.to raise_error(Discourse::InvalidParameters)
+    end
+  end
+
   context 'mute_all_categories_by_default' do
     fab!(:category) { Fabricate(:category_with_definition) }
     fab!(:topic) { Fabricate(:topic, category: category) }
diff --git a/spec/requests/list_controller_spec.rb b/spec/requests/list_controller_spec.rb
index 762d9aeff2..e84888a00a 100644
--- a/spec/requests/list_controller_spec.rb
+++ b/spec/requests/list_controller_spec.rb
@@ -410,6 +410,11 @@ RSpec.describe ListController do
       expect(response.media_type).to eq('application/rss+xml')
     end
 
+    it 'errors for invalid periods on top RSS' do
+      get "/top.rss?period=decadely"
+      expect(response.status).to eq(400)
+    end
+
     TopTopic.periods.each do |period|
       it "renders #{period} top RSS" do
         get "/top.rss?period=#{period}"

From 3cf7a3766ae97cb4c947a0ce38fee118f97db06a Mon Sep 17 00:00:00 2001
From: Andrei Prigorshnev <a.prigorshnev@gmail.com>
Date: Thu, 22 Jul 2021 11:11:23 +0400
Subject: [PATCH 70/77] DEV: extract join_group method from groups#add_members
 method (#13807)

* Copy the add_members method to the new join method

* Remove unneeded code from the join method

* Rearrange the join method

* Remove unneeded stuff from the add_members method

* Extract add_user_to_group method

* Implement of the client side

* Tests

* Doesn't inline users.uniq

* Return promise from join.then()

* Remove unnecessary begin and end

* Revert "Return promise from join.then()"

This reverts commit bda84d8d

* Remove variable already_in_group
---
 .../app/components/group-membership-button.js | 10 ++--
 .../javascripts/discourse/app/models/group.js |  8 +++
 app/controllers/groups_controller.rb          | 48 ++++++++-------
 config/routes.rb                              |  1 +
 spec/requests/groups_controller_spec.rb       | 59 ++++++++++++++-----
 5 files changed, 86 insertions(+), 40 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/group-membership-button.js b/app/assets/javascripts/discourse/app/components/group-membership-button.js
index 46329bba2d..d5481e2c61 100644
--- a/app/assets/javascripts/discourse/app/components/group-membership-button.js
+++ b/app/assets/javascripts/discourse/app/components/group-membership-button.js
@@ -50,13 +50,13 @@ export default Component.extend({
     joinGroup() {
       if (this.currentUser) {
         this.set("updatingMembership", true);
-        const model = this.model;
+        const group = this.model;
 
-        model
-          .addMembers(this.currentUser.get("username"))
+        group
+          .join()
           .then(() => {
-            model.set("is_group_user", true);
-            this.appEvents.trigger("group:join", model);
+            group.set("is_group_user", true);
+            this.appEvents.trigger("group:join", group);
           })
           .catch(popupAjaxError)
           .finally(() => {
diff --git a/app/assets/javascripts/discourse/app/models/group.js b/app/assets/javascripts/discourse/app/models/group.js
index 5fcbf4618b..6ce97c898c 100644
--- a/app/assets/javascripts/discourse/app/models/group.js
+++ b/app/assets/javascripts/discourse/app/models/group.js
@@ -127,6 +127,14 @@ const Group = RestModel.extend({
     });
   },
 
+  join() {
+    return ajax(`/groups/${this.id}/join.json`, {
+      type: "PUT",
+    }).then(() => {
+      this.findMembers();
+    });
+  },
+
   addOwners(usernames, filter, notifyUsers) {
     return ajax(`/admin/groups/${this.id}/owners.json`, {
       type: "PUT",
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index ec07ac68e0..4db8e7b921 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -333,19 +333,9 @@ class GroupsController < ApplicationController
 
   def add_members
     group = Group.find(params[:id])
-    group.public_admission ? ensure_logged_in : guardian.ensure_can_edit!(group)
+    guardian.ensure_can_edit!(group)
+
     users = users_from_params.to_a
-
-    if group.public_admission
-      if !guardian.can_log_group_changes?(group) && current_user != users.first
-        raise Discourse::InvalidAccess
-      end
-
-      unless current_user.staff?
-        RateLimiter.new(current_user, "public_group_membership", 3, 1.minute).performed!
-      end
-    end
-
     emails = []
     if params[:emails]
       params[:emails].split(",").each do |email|
@@ -376,17 +366,10 @@ class GroupsController < ApplicationController
         count: usernames_already_in_group.size
       ))
     else
+      notify = params[:notify_users]&.to_s == "true"
       uniq_users = users.uniq
       uniq_users.each do |user|
-        begin
-          group.add(user)
-          GroupActionLogger.new(current_user, group).log_add_user_to_group(user)
-          group.notify_added_to_group(user) if params[:notify_users]&.to_s == "true"
-        rescue ActiveRecord::RecordNotUnique
-          # Under concurrency, we might attempt to insert two records quickly and hit a DB
-          # constraint. In this case we can safely ignore the error and act as if the user
-          # was added to the group.
-        end
+        add_user_to_group(group, user, notify)
       end
 
       emails.each do |email|
@@ -408,6 +391,19 @@ class GroupsController < ApplicationController
     end
   end
 
+  def join
+    ensure_logged_in
+    unless current_user.staff?
+      RateLimiter.new(current_user, "public_group_membership", 3, 1.minute).performed!
+    end
+
+    group = Group.find(params[:id])
+    raise Discourse::InvalidAccess unless group.public_admission
+
+    return if group.users.exists?(id: current_user.id)
+    add_user_to_group(group, current_user)
+  end
+
   def handle_membership_request
     group = Group.find_by(id: params[:id])
     raise Discourse::InvalidParameters.new(:id) if group.blank?
@@ -650,6 +646,16 @@ class GroupsController < ApplicationController
 
   private
 
+  def add_user_to_group(group, user, notify = false)
+    group.add(user)
+    GroupActionLogger.new(current_user, group).log_add_user_to_group(user)
+    group.notify_added_to_group(user) if notify
+  rescue ActiveRecord::RecordNotUnique
+    # Under concurrency, we might attempt to insert two records quickly and hit a DB
+    # constraint. In this case we can safely ignore the error and act as if the user
+    # was added to the group.
+  end
+
   def group_params(automatic: false)
     permitted_params =
       if automatic
diff --git a/config/routes.rb b/config/routes.rb
index 820509be70..97c5b30351 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -602,6 +602,7 @@ Discourse::Application.routes.draw do
 
           get "permissions" => "groups#permissions"
           put "members" => "groups#add_members"
+          put "join" => "groups#join"
           delete "members" => "groups#remove_member"
           post "request_membership" => "groups#request_membership"
           put "handle_membership_request" => "groups#handle_membership_request"
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index b0e31de1d8..5e890d608b 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -1507,26 +1507,57 @@ describe GroupsController do
             expect(group_history.target_user).to eq(other_user)
           end
         end
+      end
+    end
 
-        it 'should allow a user to join the group' do
-          sign_in(other_user)
+    context '#join' do
+      let(:public_group) { Fabricate(:public_group) }
 
-          expect do
-            put "/groups/#{group.id}/members.json",
-              params: { usernames: other_user.username }
-          end.to change { group.users.count }.by(1)
+      it 'should allow a user to join a public group' do
+        sign_in(user)
 
-          expect(response.status).to eq(200)
-        end
+        expect do
+          put "/groups/#{public_group.id}/join.json"
+        end.to change { public_group.users.count }.by(1)
 
-        it 'should not allow an underprivileged user to add another user to a group' do
-          sign_in(user)
+        expect(response.status).to eq(204)
+      end
 
-          put "/groups/#{group.id}/members.json",
-            params: { usernames: other_user.username }
+      it 'should not allow a user to join a nonpublic group' do
+        sign_in(user)
 
-          expect(response).to be_forbidden
-        end
+        expect do
+          put "/groups/#{group.id}/join.json"
+        end.not_to change { group.users.count }
+
+        expect(response).to be_forbidden
+      end
+
+      it 'should not allow an anonymous user to call the join method' do
+        expect do
+          put "/groups/#{group.id}/join.json"
+        end.not_to change { group.users.count }
+
+        expect(response).to be_forbidden
+      end
+
+      it 'the join method is idempotent' do
+        sign_in(user)
+
+        expect do
+          put "/groups/#{public_group.id}/join.json"
+        end.to change { public_group.users.count }.by(1)
+        expect(response.status).to eq(204)
+
+        expect do
+          put "/groups/#{public_group.id}/join.json"
+        end.not_to change { public_group.users.count }
+        expect(response.status).to eq(204)
+
+        expect do
+          put "/groups/#{public_group.id}/join.json"
+        end.not_to change { public_group.users.count }
+        expect(response.status).to eq(204)
       end
     end
 

From f9aaed70202cfa5f07e7d73ee908f4843321d64d Mon Sep 17 00:00:00 2001
From: Ruoxin Wang <ruoxin123@gmail.com>
Date: Thu, 22 Jul 2021 17:55:02 +1000
Subject: [PATCH 71/77] FIX: MyBB importer exposes deleted posts (#13700)

The MyBB importer exposes posts marked as deleted in MyBB. This may lead to a privacy issue.
---
 script/import_scripts/mybb.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/script/import_scripts/mybb.rb b/script/import_scripts/mybb.rb
index 0b78cf0f7a..2189371fb2 100644
--- a/script/import_scripts/mybb.rb
+++ b/script/import_scripts/mybb.rb
@@ -26,6 +26,7 @@ class ImportScripts::MyBB < ImportScripts::Base
   BATCH_SIZE = 1000
   BASE = ""
   QUIET = true
+  IMPORT_DELETED_POSTS = false
 
   def initialize
     super
@@ -115,6 +116,7 @@ class ImportScripts::MyBB < ImportScripts::Base
           FROM #{TABLE_PREFIX}posts p,
                #{TABLE_PREFIX}threads t
          WHERE p.tid = t.tid
+        #{'AND (p.visible = 1 AND t.visible = 1)' unless IMPORT_DELETED_POSTS}
       ORDER BY p.dateline
          LIMIT #{BATCH_SIZE}
         OFFSET #{offset};

From 3667cc644787549fa0fe4730c1d1b67e9192122d Mon Sep 17 00:00:00 2001
From: Discourse Translator Bot <discourse.translator.bot@gmail.com>
Date: Thu, 22 Jul 2021 06:31:19 -0400
Subject: [PATCH 72/77] Update translations (#13821)

---
 config/locales/client.ar.yml                  |  866 ++++++++++-
 config/locales/client.da.yml                  |   15 +
 config/locales/client.fr.yml                  |    2 +-
 config/locales/client.he.yml                  |    1 +
 config/locales/client.ja.yml                  |  214 +--
 config/locales/client.pl_PL.yml               |    1 +
 config/locales/client.pt_BR.yml               |   84 +-
 config/locales/client.ru.yml                  |    2 +
 config/locales/client.sv.yml                  |    1 +
 config/locales/client.tr_TR.yml               |    4 +
 config/locales/client.zh_CN.yml               |   64 +-
 config/locales/server.ar.yml                  | 1348 +++++++++++++++++
 config/locales/server.da.yml                  |   23 +-
 config/locales/server.de.yml                  |    7 -
 config/locales/server.es.yml                  |    7 -
 config/locales/server.fi.yml                  |    7 -
 config/locales/server.fr.yml                  |    7 -
 config/locales/server.gl.yml                  |    7 -
 config/locales/server.he.yml                  |    6 -
 config/locales/server.it.yml                  |    5 -
 config/locales/server.ja.yml                  |   85 +-
 config/locales/server.ko.yml                  |    7 -
 config/locales/server.nl.yml                  |    6 -
 config/locales/server.pl_PL.yml               |    7 -
 config/locales/server.pt_BR.yml               |   67 +-
 config/locales/server.ru.yml                  |   17 +-
 config/locales/server.sv.yml                  |   23 +-
 config/locales/server.tr_TR.yml               |    1 -
 config/locales/server.uk.yml                  |    6 -
 config/locales/server.zh_CN.yml               |   51 +-
 .../config/locales/client.ja.yml              |    2 +-
 .../config/locales/client.ja.yml              |    2 +-
 .../config/locales/server.ja.yml              |    2 +-
 .../config/locales/server.zh_CN.yml           |    4 +-
 .../styleguide/config/locales/client.ja.yml   |    2 +-
 public/500.ja.html                            |    2 +-
 36 files changed, 2583 insertions(+), 372 deletions(-)

diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index 9952d5601b..9fbc4f4d5a 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -247,6 +247,7 @@ ar:
     wizard_required: "مرحبًا بك في Discourse! لنبدأ من <a href='%{url}' data-auto-route='true'>معالج الإعداد</a> ✨"
     emails_are_disabled: "أوقف أحد المسؤولين البريد الصادر بشكلٍ عام. ولن يتم إرسال إشعارات عبر البريد الإلكتروني أيًا كان نوعها."
     software_update_prompt:
+      message: "لقد حدَّثنا هذا الموقع، <span>يُرجى التحديث </span>، أو قد تواجه سلوكًا غير متوقَّع."
       dismiss: "تجاهل"
     bootstrap_mode_enabled:
       zero: "أنت في وضع تمهيد التشغيل لتسهيل إطلاق موقعك الجديد. سيتم منح جميع المستخدمين الجُدد مستوى الثقة 1 وتفعيل الرسائل الإلكترونية التلخيصية لهم. وسيتم إيقاف هذا الوضع تلقائيًا عند انضمام %{count} مستخدم."
@@ -263,6 +264,7 @@ ar:
       regions:
         ap_northeast_1: "آسيا والمحيط الهادئ (طوكيو)"
         ap_northeast_2: "آسيا والمحيط الهادئ (سول)"
+        ap_east_1: "آسيا والمحيط الهادئ (هونغ كونغ)"
         ap_south_1: "آسيا والمحيط الهادئ (مومباي)"
         ap_southeast_1: "آسيا والمحيط الهادئ (سنغافورة)"
         ap_southeast_2: "آسيا والمحيط الهادئ (سيدني)"
@@ -281,6 +283,7 @@ ar:
         us_gov_west_1: "AWS GovCloud ‏(غرب الولايات المتحدة)"
         us_west_1: "غرب الولايات المتحدة (كاليفورنيا الشمالية)"
         us_west_2: "غرب الولايات المتحدة (أوريغون)"
+    clear_input: "مسح الإدخال"
     edit: "عدَّل عنوان هذا الموضوع وفئته"
     expand: "وسّع"
     not_implemented: "عذرًا، لم يتم تنفيذ هذه الميزة بعد."
@@ -317,6 +320,13 @@ ar:
     now: "منذ لحظات"
     read_more: "قراءة المزيد"
     more: "المزيد"
+    x_more:
+      zero: "%{count} أكثر"
+      one: "%{count} أكثر"
+      two: "%{count} أكثر"
+      few: "%{count} أكثر"
+      many: "%{count} أكثر"
+      other: "%{count} أكثر"
     never: "أبدًا"
     every_30_minutes: "كلّ 30 دقيقة"
     every_hour: "كلّ ساعة"
@@ -347,6 +357,9 @@ ar:
       moderators: "المشرفون"
       stat:
         all_time: "طوال الوقت"
+        last_day: "آخر 24 ساعة"
+        last_7_days: "آخر 7 أيام"
+        last_30_days: "آخر 30 يومًا"
       like_count: "الإعجابات"
       topic_count: "الموضوعات"
       post_count: "المشاركات"
@@ -356,10 +369,13 @@ ar:
       contact_info: "في حال حدوث مشكلة خطيرة أو أمر عاجل يؤثر على الموقع، يُرجى مراسلتنا على %{contact_info}."
     bookmarked:
       title: "وضع إشارة مرجعية"
+      edit_bookmark: "تعديل الإشارة المرجعية"
       clear_bookmarks: "مسح الإشارات المرجعية"
       help:
         bookmark: "انقر لإضافة إشارة مرجعية على المنشور الأول في هذا الموضوع"
+        edit_bookmark: "انقر لتعديل الإشارة المرجعية في هذا الموضوع"
         unbookmark: "انقر لإزالة كل الإشارات المرجعية في هذا الموضوع"
+        unbookmark_with_reminder: "انقر لإزالة جميع الإشارات المرجعية والتذكيرات في هذا الموضوع."
     bookmarks:
       created: "لقد وضعت إشارة مرجعية على هذا المنشور. %{name}"
       not_bookmarked: "وضع إشارة مرجعية على هذا المنشور"
@@ -393,6 +409,10 @@ ar:
       remove_confirmation: "هل تريد بالتأكيد حذف هذه المسودة؟"
       new_topic: "مسودة موضوع جديد"
       topic_reply: "مسودة الرد"
+      abandon:
+        confirm: "لديك مسودة محفوظة لهذا الموضوع. ماذا تريد أن تفعل بها؟"
+        yes_value: "تجاهل"
+        no_value: "استئناف التعديل"
     topic_count_latest:
       zero: "عرض %{count} موضوع جديد أو محدَّث"
       one: "عرض موضوع واحد (%{count}) جديد أو محدَّث"
@@ -423,6 +443,7 @@ ar:
     upload: "تحميل"
     uploading: "جارٍ التحميل..."
     uploading_filename: "جارٍ تحميل: %{filename}..."
+    processing_filename: "قيد المعالجة: %{filename}..."
     clipboard: "الحافظة"
     uploaded: "تم التحميل!"
     pasting: "جارٍ اللصق..."
@@ -472,6 +493,7 @@ ar:
         type_bonus:
           name: "مكافأة النوع"
           title: "يمكن لفريق العمل تخصيص مكافأة لبعض الأنواع القابلة للمراجعة لمنحها أولوية أعلى."
+      stale_help: "تم إجراء هذه المراجعة بواسطة شخص آخر."
       claim_help:
         optional: "يمكنك المطالبة بهذا العنصر لمنع الآخرين من مراجعته."
         required: "يجب عليك المطالبة بالعناصر قبل أن تتمكن من مراجعتها."
@@ -518,6 +540,13 @@ ar:
         fields: "الحقول"
         reject_reason: "السبب"
       user_percentage:
+        summary:
+          zero: "%{agreed}، %{disagreed}، %{ignored} (من آخر %{count} بلاغ)"
+          one: "%{agreed}، %{disagreed}، %{ignored} (من آخر بلاغ)"
+          two: "%{agreed}، %{disagreed}، %{ignored} (من آخر بلاغين (%{count}))"
+          few: "%{agreed}، %{disagreed}، %{ignored} (من آخر %{count} بلاغات)"
+          many: "%{agreed}، %{disagreed}، %{ignored} (من آخر %{count} بلاغًا)"
+          other: "%{agreed}، %{disagreed}، %{ignored} (من آخر %{count} بلاغ)"
         agreed:
           zero: "%{count}% اتفقوا"
           one: "%{count}% اتفقوا"
@@ -633,7 +662,24 @@ ar:
           other: "لديك <strong>%{count}</strong> منشور قيد الانتظار."
         ok: "حسنًا"
       example_username: "اسم المستخدم"
+      reject_reason:
+        title: "لماذا ترفض هذا المستخدم؟"
+        send_email: "إرسال رسالة إلكترونية بالرفض"
     relative_time_picker:
+      minutes:
+        zero: "الدقائق"
+        one: "دقيقة واحدة"
+        two: "الدقائق"
+        few: "الدقائق"
+        many: "الدقائق"
+        other: "الدقائق"
+      hours:
+        zero: "الساعات"
+        one: "ساعة واحدة"
+        two: "الساعات"
+        few: "الساعات"
+        many: "الساعات"
+        other: "الساعات"
       days:
         zero: "يوم"
         one: "يوم واحد"
@@ -641,16 +687,37 @@ ar:
         few: "أيام"
         many: "يومًا"
         other: "يوم"
+      months:
+        zero: "شهر"
+        one: "شهر"
+        two: "شهران"
+        few: "أشهر"
+        many: "شهرًا"
+        other: "شهر"
+      years:
+        zero: "عام"
+        one: "عام"
+        two: "عامان"
+        few: "أعوام"
+        many: "عامًا"
+        other: "عام"
+      relative: "نسبي"
     time_shortcut:
       later_today: "لاحقًا اليوم"
       next_business_day: "يوم العمل التالي"
       tomorrow: "غدًا"
       post_local_date: "التاريخ في المنشور"
       later_this_week: "لاحقًا هذا الأسبوع"
+      this_weekend: "عطلة هذا الأسبوع"
       start_of_next_business_week: "الاثنين"
       start_of_next_business_week_alt: "الاثنين القادم"
+      two_weeks: "أسبوعان"
       next_month: "الشهر القادم"
+      six_months: "ستة أشهر"
       custom: "تاريخ ووقت مخصَّصان"
+      relative: "وقت نسبي"
+      none: "لا حاجة إليه"
+      last_custom: "آخر تاريخ ووقت مخصَّصين"
     user_action:
       user_posted_topic: "نشر <a href='%{userUrl}'>%{user}</a> ‏<a href='%{topicUrl}'>الموضوع</a>"
       you_posted_topic: "<a href='%{userUrl}'>أنت</a> نشرت ‏<a href='%{topicUrl}'>الموضوع</a>"
@@ -692,6 +759,7 @@ ar:
         many: "%{count} مستخدمًا"
         other: "%{count} مستخدم"
       edit_columns:
+        title: "تعديل أعمدة الدليل"
         save: "حفظ"
         reset_to_default: "إعادة الضبط على الافتراضي"
       group:
@@ -707,7 +775,12 @@ ar:
       member_added: "تمت الإضافة"
       member_requested: "تاريخ الطلب"
       add_members:
+        title: "إضافة مستخدمين إلى %{group_name}"
+        description: "أدخل قائمة المستخدمين الذين تريد دعوتهم إلى المجموعة أو الصقها في قائمة مفصولة بفاصلات:"
+        usernames_placeholder: "اسم المستخدمين"
+        usernames_or_emails_placeholder: "أسماء المستخدمين أو عناوين البريد الإلكتروني"
         notify_users: "إشعار المستخدمين"
+        set_owner: "تعيين المستخدمين كمالكين لهذه المجموعة"
       requests:
         title: "الطلبات"
         reason: "السبب"
@@ -721,6 +794,8 @@ ar:
         title: "إدارة"
         name: "الاسم"
         full_name: "الاسم بالكامل"
+        add_members: "إضافة مستخدمين"
+        invite_members: "دعوة"
         delete_member_confirm: "هل تريد إزالة \"%{username}\" من المجموعة \"%{group}\"؟"
         profile:
           title: الملف الشخصي
@@ -731,6 +806,24 @@ ar:
         email:
           title: "البريد الإلكتروني"
           status: "تمت مزامنة %{old_emails}/%{total_emails} من الرسائل الإلكترونية عبر IMAP."
+          enable_smtp: "تفعيل SMTP"
+          enable_imap: "تفعيل IMAP"
+          test_settings: "إعدادات الاختبار"
+          save_settings: "إعدادات الحفظ"
+          last_updated: "تاريخ آخر تحديث:"
+          last_updated_by: "بواسطة"
+          settings_required: "جميع الإعدادات مطلوبة، يُرجى ملء جميع الحقول قبل التحقُّق."
+          smtp_settings_valid: "إعدادات SMTP صالحة."
+          smtp_instructions: "عند تمكين SMTP للمجموعة، سيتم إرسال جميع الرسائل الإلكترونية الصادرة المُرسَلة من صندوق الوارد الخاص بالمجموعة عبر إعدادات SMTP المحدَّدة هنا بدلًا من خادم البريد الذي تم إعداده للرسائل الإلكترونية الأخرى التي يرسلها منتداك."
+          imap_additional_settings: "إعدادات إضافية"
+          imap_instructions: 'عند تمكين IMAP للمجموعة، تتم مزامنة الرسائل الإلكترونية بين صندوق الوارد للمجموعة وخادم IMAP وصندوق البريد المقدَّمين. يجب تفعيل SMTP باستخدام بيانات اعتماد صالحة ومُختبَرة قبل تفعيل IMAP. سيتم استخدام اسم مستخدم البريد الإلكتروني وكلمة المرور المستخدمين لخادم SMTP في خادم IMAP. لمزيد من المعلومات، راجع <a target="_blank" href="https://meta.discourse.org/t/imap-support-for-group-inboxes/160588">إعلان الميزة في Discourse Meta</a>.'
+          imap_alpha_warning: "تحذير: هذه الميزة في مرحلة الإصدار الأولي. ويتم دعم Gmail فقط بشكلٍ رسمي. استخدمها على مسؤوليتك الخاصة!"
+          imap_settings_valid: "إعدادات IMAP صالحة."
+          smtp_disable_confirm: "إذا أوقفت SMTP، فستتم إعادة ضبط جميع إعدادات SMTP وIMAP وإيقاف الوظائف المرتبطة. هل تريد بالتأكيد الاستمرار؟"
+          imap_disable_confirm: "إذا أوقفت IMAP، فستتم إعادة ضبط جميع إعدادات IMAP وإيقاف الوظائف المرتبطة. هل تريد بالتأكيد الاستمرار؟"
+          imap_mailbox_not_selected: "يجب تحديد صندوق بريد لإعداد خادم IMAP وإلا فلن تتم مزامنة أي صناديق بريد!"
+          prefill:
+            title: "الملء المسبق بإعدادات:"
           credentials:
             title: "بيانات الاعتماد"
             smtp_server: "خادم SMTP"
@@ -743,9 +836,12 @@ ar:
             password: "كلمة السر"
           settings:
             title: "الإعدادات"
+            allow_unknown_sender_topic_replies: "السماح بالرد على الموضوعات من مُرسِلين غير معروفين."
+            allow_unknown_sender_topic_replies_hint: "يسمح لمُرسِلين غير معروفين بالرد على موضوعات المجموعة. إذا لم يتم تفعيل هذا الإعداد، فستؤدي الردود الواردة من عناوين البريد الإلكتروني التي لم تتم دعوتها بالفعل إلى الموضوع إلى إنشاء موضوع جديد."
           mailboxes:
             synchronized: "صندوق البريد المتزامن"
             none_found: "لم يتم العثور على صناديق بريد في حساب البريد الإلكتروني هذا."
+            disabled: "معطَّل"
         membership:
           title: العضوية
           access: الوصول
@@ -845,7 +941,22 @@ ar:
         make_owner_description: "جعل <b>%{username}</b> أحد مالكي هذه المجموعة"
         remove_owner: "إزالة كمالك"
         remove_owner_description: "إزالة <b>%{username}</b> كمالك هذه المجموعة"
+        make_primary: "الضبط كمجموعة أساسية"
+        make_primary_description: "جعل هذه المجموعة هي المجموعة الأساسية للمستخدم <b>%{username}</b>"
+        remove_primary: "الإزالة كمجموعة أساسية"
+        remove_primary_description: "إزالة هذه المجموعة كمجموعة أساسية للمستخدم <b>%{username}</b>"
+        remove_members: "إزالة الأعضاء"
+        remove_members_description: "إزالة المستخدمين المحدَّدين من هذه المجموعة"
+        make_owners: "التعيين كمالكين"
+        make_owners_description: "تعيين المستخدمين المحدَّدين كمالكين لهذه المجموعة"
+        remove_owners: "إزالة المالكين"
+        remove_owners_description: "إزالة المستخدمين المحدَّدين كمالكين لهذه المجموعة"
+        make_all_primary: "الضبط كمجموعة أساسية للجميع"
+        make_all_primary_description: "جعل هذه المجموعة هي المجموعة الأساسية للمستخدمين المحدَّدين"
+        remove_all_primary: "الإزالة كمجموعة أساسية"
+        remove_all_primary_description: "إزالة هذه المجموعة كمجموعة أساسية"
         owner: "مالك"
+        primary: "أساسية"
         forbidden: "غير مسموح لك بعرض الأعضاء."
       topics: "الموضوعات"
       posts: "المنشورات"
@@ -926,9 +1037,23 @@ ar:
         few: "%{count} موضوعات"
         many: "%{count} موضوعًا"
         other: "%{count} موضوع"
+      topic_stat:
+        zero: "%{number}/%{unit}"
+        one: "%{number}/%{unit}"
+        two: "%{number}/%{unit}"
+        few: "%{number}/%{unit}"
+        many: "%{number}/%{unit}"
+        other: "%{number}/%{unit}"
       topic_stat_unit:
         week: "أسبوع"
         month: "شهر"
+      topic_stat_all_time:
+        zero: "الإجمالي: %{number}"
+        one: "الإجمالي: %{number}"
+        two: "الإجمالي: %{number}"
+        few: "الإجمالي: %{number}"
+        many: "الإجمالي: %{number}"
+        other: "الإجمالي: %{number}"
       topic_stat_sentence_week:
         zero: "%{count} موضوع جديد خلال الأسبوع الماضي."
         one: "موضوع واحد (%{count}) جديد خلال الأسبوع الماضي."
@@ -998,11 +1123,22 @@ ar:
         normal_option: "عادي"
         normal_option_title: "سنُرسل إليك إشعارًا في حال ردَّ هذا المستخدم عليك أو اقتبس كلامك أو أشار إليك."
       notification_schedule:
+        title: "جدول الإشعارات"
+        label: "تفعيل جدول الإشعارات المخصَّص"
+        tip: "سيتم وضعك في وضع \"عدم الإزعاج\" تلقائيًا خارج هذه الساعات."
+        midnight: "منتصف الليل"
         none: "لا يوجد"
         monday: "الاثنين"
+        tuesday: "الثلاثاء"
+        wednesday: "الأربعاء"
+        thursday: "الخميس"
+        friday: "الجمعة"
+        saturday: "السبت"
+        sunday: "الأحد"
         to: "إلى"
       activity_stream: "النشاط"
       read: "المقروءة"
+      read_help: "الموضوعات المقروءة مؤخرًا"
       preferences: "التفضيلات"
       feature_topic_on_profile:
         open_search: "تحديد موضوع جديد"
@@ -1036,16 +1172,27 @@ ar:
       dismiss: "تجاهل"
       dismiss_notifications: "تجاهل الكل"
       dismiss_notifications_tooltip: "وضع علامة مقروءة على كل الإشعارات غير المقروءة"
+      no_messages_title: "ليس لديك أي رسائل"
+      no_messages_body: >
+        هل تحتاج إلى إجراء محادثة شخصية مباشرة مع شخص ما خارج مسار إجراء المحادثات التقليدي؟ راسله عن طريق تحديد صورته الرمزية واستخدام زر الرسالة %{icon}.<br><br> إذا كنت بحاجة إلى مساعدة، يمكنك <a href='%{aboutUrl}'>مراسلة عضو في فريق العمل</a>.
+      no_bookmarks_title: "لم تضع إشارة مرجعية على أي شيء بعد"
+      no_bookmarks_body: >
+        ابدأ في وضع إشارة مرجعية على المنشورات باستخدام الزر %{icon} وسيتم إدراجها هنا للرجوع إليها بسهولة. يمكنك جدولة تذكير أيضًا!
+      no_notifications_title: "ليس لديك أي إشعارات بعد"
+      no_notifications_body: >
+        سيتم إعلامك في هذه اللوحة بالنشاط ذي الصلة المباشرة بك، بما في ذلك الردود على موضوعاتك ومنشوراتك، وعندما يشير إليك شخص ما <b>@mentions</b> أو يقتبس منك، وعندما يرد على الموضوعات التي تراقبها. سيتم أيضًا إرسال الإشعارات إلى بريدك الإلكتروني في حال عدم قيامك بتسجيل الدخول لفترة من الوقت. <br><br> ابحث عن%{icon} لتحديد الموضوعات والفئات والوسوم المحدَّدة التي تريد أن يتم إرسال إشعار إلىك بها. لمزيد من المعلومات، راجع <a href='%{preferencesUrl}'>تفضيلات الإشعارات</a>.
       first_notification: "أول إشعار تستلمه! اضغط عليه للبدء."
       dynamic_favicon: "عرض الأعداد على أيقونة المتصفح"
       skip_new_user_tips:
         description: "تخطي نصائح وشارات تهيئة المستخدم الجديد"
         not_first_time: "ليست المرة الأولى لك؟"
         skip_link: "تخطي هذه النصائح"
+        read_later: "سأقرأها لاحقًا."
       theme_default_on_all_devices: "جعل هذه السمة الافتراضية على كل أجهزتي"
       color_scheme_default_on_all_devices: "ضبط نظام (أنظمة) الألوان الافتراضي على جميع أجهزتي"
       color_scheme: "نظام الألوان"
       color_schemes:
+        default_description: "السمة الافتراضية"
         disable_dark_scheme: "مثل العادي"
         dark_instructions: "يمكنك معاينة نظام ألوان الوضع الداكن عن طريق تفعيل الوضع الداكن لجهازك."
         undo: "إعادة الضبط"
@@ -1145,6 +1292,7 @@ ar:
         move_to_archive: "أرشفة"
         failed_to_move: "فشل نقل الرسائل المحدَّدة (قد تكون شبكتك متوقفة)"
         tags: "الوسوم"
+        warnings: "تحذيرات رسمية"
       preferences_nav:
         account: "الحساب"
         security: "الأمان"
@@ -1267,6 +1415,7 @@ ar:
         uploaded_avatar_empty: "إضافة صورة مخصَّصة"
         upload_title: "تحميل صورتك"
         image_is_not_a_square: "تحذير: لقد قصصنا صورتك؛ لأن عرضها وارتفاعها لم يكونا متساويين."
+        logo_small: "شعار الموقع الصغير. يتم استخدامه بشكلٍ افتراضي."
       change_profile_background:
         title: "رأس الملف الشخصي"
         instructions: "سيتم توسيط رؤوس الملفات الشخصية وسيكون عرضها الافتراضي 1110 بكسل."
@@ -1289,6 +1438,7 @@ ar:
         set_primary: "ضبط عنوان البريد الإلكتروني الرئيسي"
         destroy: "إزالة عنوان البريد الإلكتروني"
         add_email: "إضافة بريد إلكتروني بديل"
+        auth_override_instructions: "يمكن تحديث البريد الإلكتروني من موفِّر المصادقة."
         no_secondary: "لا توجد عناوين بريد إلكتروني ثانوية"
         instructions: "لا يظهر للعامة أبدًا."
         admin_note: "ملاحظة: يشير تغيير المستخدم المسؤول لعنوان البريد الإلكتروني لمستخدم آخر غير مسؤول إلى أن المستخدم قد فقد الوصول إلى حساب البريد الإلكتروني الأصلي؛ لذلك ستتم مراسلته عبر البريد الإلكتروني لإعادة ضبط كلمة المرور إلى عنوانه الجديد. ولن يتغير عنوان البريد الإلكتروني للمستخدم حتى يكمل عملية إعادة ضبط كلمة المرور."
@@ -1296,6 +1446,8 @@ ar:
         required: "يُرجى إدخال عنوان بريد إلكتروني"
         invalid: "يُرجى إدخال عنوان بريد إلكتروني صالح"
         authenticated: "تمت مصادقة عنوان بريدك الإلكتروني بواسطة %{provider}"
+        invite_auth_email_invalid: "لا يتطابق البريد الإلكتروني للدعوة مع البريد الإلكتروني المُصادَق عليه بواسطة %{provider}"
+        authenticated_by_invite: "تمت المصادقة على بريدك الإلكتروني من خلال الدعوة"
         frequency_immediately: "سنُرسل إليك رسالة إلكترونية فورًا إذا كنت لم تقرأ الشيء الذي نُرسل إليك بشأنه."
         frequency:
           zero: "لن نراسلك عبر البريد الإلكتروني إلا في حال مُضي %{count} دقيقة على آخر زيارة لك للموقع."
@@ -1333,6 +1485,7 @@ ar:
         checking: "جارٍ التحقُّق من توفُّر اسم المستخدم..."
         prefilled: "هذا البريد الالكتروني مطابق لاسم المستخدم المسجَّل هذا"
         required: "يُرجى إدخال اسم مستخدم"
+        edit: "تعديل اسم المستخدم"
       locale:
         title: "لغة الواجهة"
         instructions: "لغة واجهة المستخدم. ستتغير عند تحديث الصفحة."
@@ -1431,15 +1584,22 @@ ar:
         title: "الدعوات"
         pending_tab: "قيد الانتظار"
         pending_tab_with_count: "قيد الانتظار (%{count})"
+        expired_tab: "منتهية"
+        expired_tab_with_count: "المنتهية (%{count})"
         redeemed_tab: "تم استردادها"
         redeemed_tab_with_count: "تم استردادها (%{count})"
         invited_via: "الدعوة"
+        invited_via_link: "رابط %{key} (تم استرداد %{count}/%{max})"
         groups: "المجموعات"
         topic: "الموضوع"
+        sent: "تاريخ الإنشاء/آخر إرسال"
         expires_at: "وقت الانتهاء"
         edit: "تعديل"
         remove: "إزالة"
+        copy_link: "إنشاء رابط"
+        reinvite: "إعادة إرسال الرسالة الإلكترونية"
         reinvited: "تمت إعادة إرسال الدعوة"
+        removed: "تمت إزالتها"
         search: "اكتب للبحث في الدعوات..."
         user: "المستخدم المدعو"
         none: "لا توجد دعوات لعرضها."
@@ -1459,7 +1619,9 @@ ar:
         remove_all: "إزالة الدعوات المنتهية"
         removed_all: "تمت إزالة جميع الدعوات المنتهية!"
         remove_all_confirm: "هل تريد بالتأكيد إزالة جميع الدعوات المنتهية؟"
+        reinvite_all: "إعادة إرسال جميع الدعوات"
         reinvite_all_confirm: "هل تريد بالتأكيد إعادة إرسال كل الدعوات؟"
+        reinvited_all: "تم إرسال جميع الدعوات!"
         time_read: "وقت القراءة"
         days_visited: "أيام الزيارة"
         account_age_days: "عمر الحساب بالأيام"
@@ -1475,9 +1637,34 @@ ar:
           error: "حدث خطأ في أثناء إنشاء رابط الدعوة"
           max_redemptions_allowed_label: "كم شخصًا يمكنه التسجيل باستخدام هذا الرابط؟"
           expires_at: "متى تنتهي صلاحية رابط الدعوة هذا؟"
+        invite:
+          new_title: "إنشاء دعوة"
+          edit_title: "تعديل الدعوة"
+          instructions: "شارك هذا الرابط لمنح حق الوصول إلى هذا الموقع على الفور"
+          copy_link: "نسخ الرابط"
+          expires_in_time: "تنتهي صلاحيتها في %{time}"
+          expired_at_time: "تنتهي صلاحيتها في %{time}"
+          show_advanced: "عرض الخيارات المتقدمة"
+          hide_advanced: "عرض الخيارات المتقدمة"
+          restrict_email: "التقييد على عنوان بريد إلكتروني واحد"
+          max_redemptions_allowed: "الحد الأقصى لمرات الاستخدام"
+          add_to_groups: "إضافة إلى المجموعات"
+          invite_to_topic: "الوصول إلى هذا الموضوع"
+          expires_at: "تنتهي بعد"
+          custom_message: "رسالة خاصة اختيارية"
+          send_invite_email: "حفظ الرسالة الإلكترونية وإرسالها"
+          save_invite: "حفظ الدعوة"
+          invite_saved: "تم حفظ الدعوة."
+          invite_copied: "تم نسخ رابط الدعوة."
         bulk_invite:
           none: "لا توجد دعوات لعرضها على هذه الصفحة."
           text: "دعوة جماعية"
+          instructions: |
+            <p>أرسل دعوة إلى قائمة من المستخدمين لإنشاء مجتمعك بسرعة. يمكنك إعداد <a href="https://en.wikipedia.org/wiki/Comma-separated_values" target="_blank">ملف CSV</a> يتضمَّن صفًا واحدًا على الأقل لكل عنوان بريد إلكتروني للمستخدمين الذين تريد دعوتهم. يمكنك إدخال المعلومات التالية المفصولة بفاصلات إذا كنت تريد إضافة أشخاص إلى مجموعات أو إرسالهم إلى موضوع معيَّن في المرة الأولى التي يسجِّلون فيها الدخول.</p>
+            <pre>john@smith.com,first_group_name;second_group_name,topic_id</pre>
+            <p>سيتم إرسال دعوة إلى كل عنوان بريد إلكتروني في ملف CSV الذي تم تحميله، وستتمكن من إدارته لاحقًا.</p>
+          progress: "تم تحميل %{progress}%..."
+          success: "تم تحميل الملف بنجاح. سيتم إرسال إشعار إليك عبر رسالة عند اكتمال العملية."
           error: "عذرًا، يجب أن يكون الملف بتنسيق CSV."
       password:
         title: "كلمة السر"
@@ -1574,12 +1761,15 @@ ar:
       avatar:
         title: "صورة الملف الشخصي"
         header_title: "الملف الشخصي والرسائل والإشارات المرجعية والتفضيلات"
+        edit: "تعديل صورة الملف الشخصي"
       title:
         title: "اللقب"
         none: "(لا يوجد)"
+        instructions: "يظهر بعد اسم المستخدم"
       flair:
         title: "الطابع"
         none: "(لا يوجد)"
+        instructions: "يتم عرض الرمز بجوار صورة ملفك الشخصي"
       primary_group:
         title: "المجموعة الرئيسية"
         none: "(لا يوجد)"
@@ -1614,6 +1804,7 @@ ar:
       close: "إغلاق"
       dismiss_error: "تجاهل الخطأ"
     close: "إغلاق"
+    assets_changed_confirm: "لقد تلقى هذا الموقع ترقية برمجية للتو. هل تريد الحصول على أحدث نسخة الآن؟"
     logout: "تم تسجيل خروجك."
     refresh: "تحديث"
     home: "الصفحة الرئيسية"
@@ -1654,10 +1845,19 @@ ar:
       sign_up: "الاشتراك"
       hide_session: "تذكيري غدًا"
       hide_forever: "لا، شكرًا"
+      hidden_for_session: "حسنًا، سنسألك غدًا. يمكنك دائمًا استخدام \"تسجيل الدخول\" لإنشاء حساب أيضًا."
       intro: "مرحبًا! يبدو أنك تستمتع بالمناقشة، لكنك لم تشترك للحصول على حساب حتى الآن."
       value_prop: "عند إنشاء حساب، فإننا نتذكَّر ما قرأته بالضبط؛ حتى تتمكن دائمًا من العودة والمتابعة من حيث توقفت. ستتلقى أيضًا الإشعارات هنا وعبر البريد الإلكتروني كلما ردَّ أحد عليك. ويمكنك تسجيل إعجابك بالمنشورات لمشاركة مشاعر الود. :heartpulse:"
     summary:
       enabled_description: "أنت تعرض ملخصًا لهذا الموضوع: المنشورات الأكثر إثارة للاهتمام وفقًا للمجتمع."
+      description:
+        zero: "هناك <b>%{count}</b> من الردود."
+        one: "هناك رد واحد (<b>%{count}</b>)."
+        two: "هناك <b>%{count}</b> من الردود."
+        few: "هناك <b>%{count}</b> من الردود."
+        many: "هناك <b>%{count}</b> من الردود."
+        other: "هناك <b>%{count}</b> من الردود."
+      description_time_MF: "هناك {replyCount, plural, zero {<strong>#</strong> رد} one {رد واحد (<strong>#</strong>)} two {ردَّان (<strong>#</strong>)} few {<strong>#</strong> ردود} many {<strong>#</strong> ردًا} other {<strong>#</strong> رد}} والوقت المقدَّر للقراءة هو <b>{readingTime, plural, zero {<strong>#</strong> دقيقة} one {دقيقة واحدة (<strong>#</strong>)} two {دقيقتان (<strong>#</strong>)} few {<strong>#</strong> دقائق} many {<strong>#</strong> دقيقة} other {<strong>#</strong> دقيقة}}</b>"
       enable: "تلخيص هذا الموضوع"
       disable: "عرض كل المنشورات"
     deleted_filter:
@@ -1683,7 +1883,9 @@ ar:
     search_hint: "اسم المستخدم أو البريد إلكتروني أو عنوان IP"
     create_account:
       header_title: "مرحبًا!"
+      subheader_title: "لننشئ حسابك"
       disclaimer: "يشير التسجيل إلى موافقتك على <a href='%{privacy_link}' target='blank'>سياسة الخصوصية</a> و<a href='%{tos_link}' target='blank'>شروط الخدمة</a>."
+      title: "إنشاء حسابك"
       failed: "حدث خطأ ما. قد يكون هذا البريد الإلكتروني مسجلًا بالفعل. جرِّب رابط نسيان كلمة المرور"
     forgot_password:
       title: "إعادة ضبط كلمة المرور"
@@ -1702,6 +1904,7 @@ ar:
     email_login:
       link_label: "مراسلتي عبر البريد الإلكتروني برابط تسجيل الدخول"
       button_label: "عبر البريد الإلكتروني"
+      login_link: "تخطي كلمة المرور؛ مراسلتي عبر البريد الإلكتروني برابط تسجيل الدخول"
       emoji: "رمز قفل"
       complete_username: "إذا تطابق أحد الحسابات مع اسم المستخدم <b>%{username}</b>، فمن المفترض أن تتلقى رسالة إلكترونية برابط تسجيل الدخول قريبًا."
       complete_email: "إذا تطابق أحد الحسابات مع عنوان البريد الإلكتروني <b>%{email}</b>، فمن المفترض أن تتلقى رسالة إلكترونية برابط تسجيل الدخول قريبًا."
@@ -1715,6 +1918,7 @@ ar:
     login:
       header_title: "مرحبًا بعودتك"
       subheader_title: "تسجيل الدخول إلى حسابك"
+      title: "تسجيل الدخول"
       username: "المستخدم"
       password: "كلمة المرور"
       second_factor_title: "المصادقة الثنائية"
@@ -1729,6 +1933,7 @@ ar:
       security_key_not_allowed_error: "انتهت مهلة عملية المصادقة باستخدام مفتاح أمان أو تم إلغاؤها."
       security_key_no_matching_credential_error: "تعذَّر العثور على بيانات اعتماد مطابقة في مفتاح الأمان المقدَّم."
       security_key_support_missing_error: "لا يدعم جهازك أو متصفحك الحالي استخدام مفاتيح الأمان. يُرجى استخدام طريقة مختلفة."
+      email_placeholder: "البريد الإلكتروني/اسم المستخدم"
       caps_lock_warning: "مفتاح Caps Lock مفعَّل"
       error: "خطأ غير معروف"
       cookies_error: "يبدو أن ملفات تعريف الارتباط في متصفحك متوقفة. قد لا تتمكن من تسجيل الدخول قبل تفعيلها أولًا."
@@ -1820,7 +2025,23 @@ ar:
         few: "%{count} موضوعات في هذه الفئة"
         many: "%{count} موضوعًا في هذه الفئة"
         other: "%{count} موضوع في هذه الفئة"
+      plus_subcategories_title:
+        zero: "%{name} تصنيف فرعي واحد و %{count} تصنيفات فرعية"
+        one: "%{name} وفئة فرعية واحدة (%{count})"
+        two: "%{name} وفئتان فرعيتان (%{count})"
+        few: "%{name} و%{count} فئات فرعية"
+        many: "%{name} و%{count} فئة فرعية"
+        other: "%{name} و%{count} فئة فرعية"
+      plus_subcategories:
+        zero: "تصنيف فرعي + %{count} و تصنيفات فرعية"
+        one: "+ %{count} تصنيفات فرعية"
+        two: "+ %{count} تصنيف فرعي واحد و تصنيفات فرعية"
+        few: "+ %{count} فئات فرعية"
+        many: "+ %{count} فئة فرعية"
+        other: "+ %{count} فئة فرعية"
     select_kit:
+      filter_by: "التصفية حسب: %{name}"
+      select_to_filter: "تحديد قيمة للتصفية"
       default_header_text: تحديد...
       no_content: لم يتم العثور على نتائج مطابقة
       filter_placeholder: بحث...
@@ -1848,6 +2069,8 @@ ar:
         many: "يجب ألا يقل التحديد عن %{count} حرفًا على الأقل."
         other: "يجب ألا يقل التحديد عن %{count} حرف على الأقل."
       components:
+        tag_drop:
+          filter_for_more: المزيد من عوامل التصفية...
         categories_admin_dropdown:
           title: "إدارة الفئات"
     date_time_picker:
@@ -1874,6 +2097,7 @@ ar:
       default: الرموز التعبيرية المخصَّصة
     shared_drafts:
       title: "المسودات المشتركة"
+      notice: "هذا الموضوع مرئي فقط لمن يمكنهم نشر المسودات المشتركة."
       destination_category: "فئة الوجهة"
       publish: "نشر المسودة المشتركة"
       confirm_publish: "هل تريد بالتأكيد نشر هذه المسودة؟"
@@ -1913,7 +2137,28 @@ ar:
       reference_topic_title: "بخصوص: %{title}"
       error:
         title_missing: "العنوان مطلوب"
+        title_too_short:
+          zero: "العنوان يجب أن يكون علي الاقل %{count} حرف"
+          one: "يجب ألا يقل العنوان عن حرف واحد (%{count})"
+          two: "العنوان يجب أن يكون علي الاقل %{count} حرف"
+          few: "العنوان يجب أن يكون علي الاقل %{count} حرف"
+          many: "العنوان يجب أن يكون علي الاقل %{count} حرف"
+          other: "العنوان يجب أن يكون علي الاقل %{count} حرف"
+        title_too_long:
+          zero: "العنوان يجب أن لا يزيد عن %{count} حرف"
+          one: "يجب ألا يزيد العنوان عن حرف واحد (%{count})"
+          two: "العنوان يجب أن لا يزيد عن %{count} حرف"
+          few: "العنوان يجب أن لا يزيد عن %{count} حرف"
+          many: "العنوان يجب أن لا يزيد عن %{count} حرف"
+          other: "العنوان يجب أن لا يزيد عن %{count} حرف"
         post_missing: "لا يمكن ترك المنشور فارغًا"
+        post_length:
+          zero: "المنشور يجب أن يكون علي الاقل %{count} حرف"
+          one: "يجب ألا يقل المنشور عن حرف واحد (%{count})"
+          two: "المنشور يجب أن يكون علي الاقل %{count} حرف"
+          few: "المنشور يجب أن يكون علي الاقل %{count} حرف"
+          many: "المنشور يجب أن يكون علي الاقل %{count} حرف"
+          other: "المنشور يجب أن يكون علي الاقل %{count} حرف"
         try_like: "هل جرَّبت زر %{heart}؟"
         category_missing: "عليك اختيار فئة"
         tags_missing:
@@ -1950,6 +2195,8 @@ ar:
       saved: "تم الحفظ!"
       saved_draft: "لديك مسودة منشور محفوظة. اضغط لاستئنافها."
       uploading: "جارٍ التحميل..."
+      show_preview: "إظهار المعاينة"
+      hide_preview: "إخفاء المعاينة"
       quote_post_title: "اقتباس المنشور بأكمله"
       bold_label: "B"
       bold_title: "غامق"
@@ -1987,6 +2234,8 @@ ar:
       yourself_confirm:
         title: "هل نسيت إضافة المستلمين؟"
         body: "هذه الرسالة يتم إرسالها إليك فقط في الوقت الحالي!"
+      slow_mode:
+        error: "هذا الموضوع في الوضع البطيء. لقد نشرت بالفعل مؤخرًا؛ يمكنك النشر مرة أخرى بعد %{timeLeft}."
       admin_options_title: "إعدادات فريق العمل الاختيارية لهذا الموضوع"
       composer_actions:
         reply: الرد
@@ -2081,6 +2330,7 @@ ar:
       granted_badge: "تم منحك شارة \"%{description}\""
       topic_reminder: "‏<span>⁨%{username}⁩</span> ‏%{description}"
       watching_first_post: "<span>موضوع جديد</span>: ‏%{description}"
+      membership_request_accepted: "تم قبول العضوية في \"%{group_name}\""
       membership_request_consolidated:
         zero: "%{count} طلب عضوية مفتوح للمجموعة \"%{group_name}\""
         one: "طلب عضوية واحد (%{count}) مفتوح للمجموعة \"%{group_name}\""
@@ -2090,6 +2340,7 @@ ar:
         other: "%{count} طلب عضوية مفتوح للمجموعة \"%{group_name}\""
       reaction: "‏<span>⁨%{username}⁩</span> ‏%{description}"
       reaction_2: "<span>%{username} و%{username2}</span> %{description}"
+      votes_released: "%{description} - اكتمل"
       group_message_summary:
         zero: "%{count} رسالة في صندوق البريد الوارد للمجموعة %{group_name}"
         one: "رسالة واحدة (%{count}) في صندوق البريد الوارد للمجموعة %{group_name}"
@@ -2107,21 +2358,36 @@ ar:
         linked: 'وضع %{username} رابطًا لمنشورك من "%{topic}" - %{site_title}'
         watching_first_post: 'أنشأ %{username} موضوعًا جديدًا: "%{topic}" -‏ %{site_title}'
         confirm_title: "تم تفعيل الإشعارات - %{site_title}"
+        confirm_body: "تم بنجاح! تم تفعيل الإشعارات."
+        custom: "إشعار من %{username} على %{site_title}"
       titles:
         mentioned: "تمت الإشارة إليك"
         replied: "رد جديد"
         quoted: "تم اقتباس لكلامك"
+        edited: "تم التعديل"
         liked: "مرة إعجاب جديدة"
         private_message: "رسالة خاصة جديدة"
         invited_to_private_message: "تمت دعوتك إلى رسالة خاصة"
         invitee_accepted: "تم قبول الدعوة"
         posted: "منشور جديد"
+        moved_post: "تم نقل المنشور"
+        linked: "تم ربطه"
+        bookmark_reminder: "تذكير الإشارة المرجعية"
+        bookmark_reminder_with_name: "تذكير الإشارة المرجعية - %{name"
         granted_badge: "تم منحك شارة"
         invited_to_topic: "تمت دعوتك إلى موضوع"
+        group_mentioned: "تمت الإشارة إلى المجموعة"
+        group_message_summary: "رسائل جديدة للمجموعة"
         watching_first_post: "موضوع جديد"
+        topic_reminder: "تذكير الموضوع"
+        liked_consolidated: "إعجابات جديدة"
+        post_approved: "تمت الموافقة على المنشور"
+        membership_request_consolidated: "طلبات العضوية الجديدة"
         reaction: "تفاعل جديد"
+        votes_released: "تم تحرير التصويت"
     upload_selector:
       uploading: "جارٍ التحميل"
+      processing: "التحميل قيد المعالجة"
       select_file: "تحديد الملف"
       default_image_alt_text: صورة
     search:
@@ -2157,6 +2423,7 @@ ar:
       context:
         user: "البحث عن المنشورات باسم المستخدم @%{username}"
         category: "البحث في الفئة #%{category}"
+        tag: "البحث عن الوسم #%{tag}"
         topic: "البحث في هذا الموضوع"
         private_messages: "البحث في الرسائل"
       advanced:
@@ -2179,12 +2446,14 @@ ar:
           created: أنشأتها
           watching: أراقبها
           tracking: أتتبعها
+          private: في رسائلي
           bookmarks: وضعت عليها إشارة مرجعية
           first: تكون أول منشور
           pinned: تكون مثبَّتة
           seen: قرأتها
           unseen: لم أقرأها
           wiki: تكون من النوع Wiki
+          images: يتضمَّن صورًا
           all_tags: كل الوسوم أعلاه
         statuses:
           label: حيث تكون الموضوعات
@@ -2216,6 +2485,7 @@ ar:
     go_back: "الرجوع"
     not_logged_in_user: "صفحة المستخدم مع ملخص عن نشاطه الحالي وتفضيلاته"
     current_user: "الانتقال إلى صفحة المستخدم"
+    view_all: "عرض الكل %{tab}"
     topics:
       new_messages_marker: "آخر زيارة"
       bulk:
@@ -2227,10 +2497,31 @@ ar:
         delete: "حذف الموضوعات"
         dismiss: "تجاهل"
         dismiss_read: "تجاهل جميع الموضوعات غير المقروءة"
+        dismiss_read_with_selected:
+          zero: "تجاهل %{count} غير مقروءة"
+          one: "تجاهل %{count} غير مقروءة"
+          two: "تجاهل %{count}غير مقروءين"
+          few: "تجاهل %{count} غير مقروءة"
+          many: "تجاهل %{count} غير مقروءة"
+          other: "تجاهل %{count} غير مقروءة"
         dismiss_button: "تجاهل..."
+        dismiss_button_with_selected:
+          zero: "تجاهل (%{count})…"
+          one: "تجاهل (%{count})…"
+          two: "تجاهل (%{count})…"
+          few: "تجاهل (%{count})…"
+          many: "تجاهل (%{count})…"
+          other: "تجاهل (%{count})…"
         dismiss_tooltip: "تجاهل المنشورات الجديدة فقط أو التوقف عن تتبُّع الموضوعات"
         also_dismiss_topics: "التوقف عن تتبُّع هذه الموضوعات حتي لا تظهر لي كغير مقروءة مرة أخرى"
         dismiss_new: "تجاهل الجديدة"
+        dismiss_new_with_selected:
+          zero: "تجاهل الجديدة (%{count})"
+          one: "تجاهل الجديدة (%{count})"
+          two: "تجاهل الجديدة (%{count})"
+          few: "تجاهل الجديدة (%{count})"
+          many: "تجاهل الجديدة (%{count})"
+          other: "تجاهل الجديدة (%{count})"
         toggle: "تفعيل التحديد الجماعي للموضوعات"
         actions: "الإجراءات الجماعية"
         change_category: "ضبط الفئة"
@@ -2238,6 +2529,7 @@ ar:
         archive_topics: "أرشفة الموضوعات"
         move_messages_to_inbox: "النقل إلى صندوق الوارد"
         notification_level: "الإشعارات"
+        change_notification_level: "تغيير مستوى الإشعارات"
         choose_new_category: "اختر الفئة الجديدة للموضوعات:"
         selected:
           zero: "لقد حدَّدت <b>%{count}</b> موضوع."
@@ -2251,14 +2543,33 @@ ar:
         choose_new_tags: "اختيار الوسوم الجديدة لهذه الموضوعات:"
         choose_append_tags: "اختيار الوسوم الجديدة لإضافتها إلى هذه الموضوعات:"
         changed_tags: "تم تغيير وسومات هذه الموضوعات."
+        remove_tags: "إزالة كل الوسوم"
+        confirm_remove_tags:
+          zero: "ستتم إزالة كل الوسوم من <b>%{count}</b> موضوع. هل أنت متأكد؟"
+          one: "ستتم إزالة كل الوسوم من هذا الموضوع. هل أنت متأكد؟"
+          two: "ستتم إزالة كل الوسوم من موضوعَين (<b>%{count}</b>). هل أنت متأكد؟"
+          few: "ستتم إزالة كل الوسوم من <b>%{count}</b> موضوعات. هل أنت متأكد؟"
+          many: "ستتم إزالة كل الوسوم من <b>%{count}</b> موضوعًا. هل أنت متأكد؟"
+          other: "ستتم إزالة كل الوسوم من <b>%{count}</b> موضوع. هل أنت متأكد؟"
+        progress:
+          zero: "التقدُّم: <strong>%{count}</strong> موضوع"
+          one: "التقدُّم: موضوع واحد (<strong>%{count}</strong>)"
+          two: "التقدُّم: موضوعان (<strong>%{count}</strong>)"
+          few: "التقدُّم: <strong>%{count}</strong> موضوعات"
+          many: "التقدُّم: <strong>%{count}</strong> موضوعًا"
+          other: "التقدُّم: <strong>%{count}</strong> موضوع"
       none:
         unread: "ليست هناك موضوعات غير مقروءة."
         new: "ليس لديك موضوعات جديدة."
         read: "لم تقرأ أي موضوع بعد."
         posted: "لم تنشر في أي موضوع بعد."
+        latest: "لا توجد موضوعات أخرى!"
         bookmarks: "لم تضع إشارة مرجعية على أي موضوع بعد."
         category: "لا توجد موضوعات في الفئة %{category}."
         top: "لا توجد موضوعات في الأكثر نشاطًا."
+        educate:
+          new: '<p>ستظهر موضوعاتك الجديدة هنا. تُعتبَر الموضوعات جديدة بشكلٍ افتراضي وستعرض مؤشر <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;"></span> إذا كان قد تم إنشاؤها في آخر يومين.</p><p>يمكنك الانتقال إلى a href="%{userPrefsUrl}">تفضيلاتك</a> لتغيير ذلك.</p>'
+          unread: "<p>ستظهر موضوعاتك غير المقروءة هنا.</p><p>تُعتبَر الموضوعات غير مقروءة بشكلٍ افتراضي وستعرض <span class=\"badge unread-posts badge-notification\">1</span> بالأعداد غير المقروءة إذا كنت قد:</p><ul><li>أنشأت الموضوع</li><li>رددت على الموضوع</li><li>قرأت الموضوع لأكثر من 4 دقائق</li></ul><p>أو إذا وضعت الموضوع صراحةً تحت \"المراقبة\" أو \"التتبُّع\" عبر \U0001F514 في كل موضوع.</p><p>يمكنك الانتقال إلى a href=\"%{userPrefsUrl}\">تفضيلاتك</a> لتغيير ذلك.</p>"
       bottom:
         latest: "لا يوجد المزيد من الموضوعات الحديثة."
         posted: "لا يوجد المزيد من الموضوعات المنشورة."
@@ -2288,6 +2599,7 @@ ar:
         title: "النقل إلى صندوق الوارد"
         help: "إعادة الرسالة إلى صندوق الوارد"
       edit_message:
+        help: "تعديل أول منشور في الرسالة"
         title: "تعديل"
       defer:
         help: "وضع علامة كغير مقروءة"
@@ -2337,6 +2649,8 @@ ar:
       back_to_list: "العودة إلى قائمة الموضوعات"
       options: "خيارات الموضوعات"
       show_links: "إظهار الروابط في هذا الموضوع"
+      collapse_details: "طي تفاصيل الموضوع"
+      expand_details: "توسيع تفاصيل الموضوع"
       read_more_in_category: "هل تريد قراءة المزيد؟ تصفَّح الموضوعات الأخرى في %{catLink} أو %{latestLink}."
       read_more: "هل تريد قراءة المزيد؟ %{catLink} أو %{latestLink}."
       unread_indicator: "لم يقرأ أي عضو آخر منشور في هذا الموضوع بعد."
@@ -2345,13 +2659,17 @@ ar:
       browse_all_categories: تصفُّح كل الفئات
       browse_all_tags: تصفُّح كل الوسوم
       view_latest_topics: عرض أحدث الموضوعات
+      suggest_create_topic: هل أنت مستعد <a href>لبدء محادثة جديدة؟</a>
       jump_reply_up: الانتقال إلى الرد السابق
       jump_reply_down: الانتقال إلى الرد التالي
       deleted: "لقد تم حذف الموضوع"
       slow_mode_update:
         title: "الوضع البطيء"
         select: "لا يمكن للمستخدمين النشر في هذا الموضوع إلا مرة كل:"
+        description: "لتعزيز المناقشة عميقة الفكر في المناقشات سريعة التطور أو المثيرة للجدل، يجب على المستخدمين الانتظار قبل النشر مرة أخرى في هذا الموضوع."
         enable: "تفعيل"
+        update: "تحديث"
+        enabled_until: "مفعَّل حتى:"
         remove: "إيقاف"
         hours: "الساعات:"
         minutes: "الدقائق:"
@@ -2367,13 +2685,20 @@ ar:
           8_hours: "8 ساعات"
           12_hours: "12 ساعة"
           24_hours: "24 ساعة"
+          custom: "المدة المخصَّصة"
+      slow_mode_notice:
+        duration: "يُرجى الانتظار لمدة %{duration} بين المنشورات في هذا الموضوع"
       topic_status_update:
+        title: "مؤقِّت الموضوع"
         save: "ضبط المؤقِّت"
         num_of_hours: "عدد الساعات:"
+        num_of_days: "عدد الأيام:"
         remove: "إزالة المؤقِّت"
         publish_to: "النشر على:"
         when: "التوقيت:"
         time_frame_required: "يُرجى تحديد إطار زمني"
+        min_duration: "يجب أن تكون المدة أكبر من 0"
+        max_duration: "يجب أن تكون المدة أقل من 20 عامًا"
       auto_update_input:
         none: "تحديد إطار زمني"
         now: "الآن"
@@ -2382,7 +2707,13 @@ ar:
         later_this_week: "لاحقًا هذا الأسبوع"
         this_weekend: "عطلة هذا الأسبوع"
         next_week: "الأسبوع القادم"
+        two_weeks: "أسبوعان"
         next_month: "الشهر القادم"
+        two_months: "شهران"
+        three_months: "ثلاثة أشهر"
+        four_months: "أربعة أشهر"
+        six_months: "ستة أشهر"
+        one_year: "عام واحد"
         forever: "للأبد"
         pick_date_and_time: "اختيار التاريخ والوقت"
         set_based_on_last_post: "الإغلاق حسب آخر منشور"
@@ -2396,8 +2727,11 @@ ar:
         title: "غلق الموضوع مؤقتًا"
       auto_close:
         title: "غلق الموضوع تلقائيًا"
+        label: "إغلاق الموضوع تلقائيًا بعد:"
         error: "يُرجى إدخال قيمة صالحة."
         based_on_last_post: "لا تُغلقه إلى أن يمضي على آخر منشور في الموضوع هذه الفترة على الأقل."
+      auto_close_after_last_post:
+        title: "إغلاق الموضوع تلقائيًا بعد المنشور الأخير"
       auto_delete:
         title: "حذف الموضوع تلقائيًا"
       auto_bump:
@@ -2423,6 +2757,13 @@ ar:
         few: "مضت %{count} ساعات بالفعل على آخر منشور في الموضوع؛ لذا فسيتم إغلاق الموضوع على الفور."
         many: "مضت %{count} ساعة بالفعل على آخر منشور في الموضوع؛ لذا فسيتم إغلاق الموضوع على الفور."
         other: "مضت %{count} ساعة بالفعل على آخر منشور في الموضوع؛ لذا فسيتم إغلاق الموضوع على الفور."
+      auto_close_momentarily:
+        zero: " مضت %{count} ساعة بالفعل على آخر منشور في الموضوع؛ لذلك سيتم إغلاق الموضوع مؤقتًا."
+        one: " مضت ساعة واحدة (%{count}) بالفعل على آخر منشور في الموضوع؛ لذلك سيتم إغلاق الموضوع مؤقتًا."
+        two: " مضت ساعتان (%{count}) بالفعل على آخر منشور في الموضوع؛ لذلك سيتم إغلاق الموضوع مؤقتًا."
+        few: " مضت %{count} ساعات بالفعل على آخر منشور في الموضوع؛ لذلك سيتم إغلاق الموضوع مؤقتًا."
+        many: " مضت %{count} ساعة بالفعل على آخر منشور في الموضوع؛ لذلك سيتم إغلاق الموضوع مؤقتًا."
+        other: " مضت %{count} ساعة بالفعل على آخر منشور في الموضوع؛ لذلك سيتم إغلاق الموضوع مؤقتًا."
       timeline:
         back: "الرجوع"
         back_description: "الرجوع إلى آخر منشور غير مقروء"
@@ -2434,6 +2775,13 @@ ar:
         go: "الانتقال"
         jump_bottom: "الانتقال إلى آخر منشور"
         jump_prompt: "انتقل إلى..."
+        jump_prompt_of:
+          zero: "من %{count} منشورات"
+          one: "من منشور واحد (%{count})"
+          two: "من %{count} منشورات"
+          few: "من %{count} منشورات"
+          many: "من %{count} منشورات"
+          other: "من %{count} منشورات"
         jump_prompt_long: "الانتقال إلى..."
         jump_bottom_with_number: "انتقل إلى المشاركة رقم %{post_number}"
         jump_prompt_to_date: "إلى التاريخ"
@@ -2445,12 +2793,15 @@ ar:
         reasons:
           mailing_list_mode: "وضع القائمة البريدية مفعَّل لديك؛ لذا فتتلقى إشعارات بالردود على هذا الموضوع عبر البريد الإلكتروني."
           "3_10": "ستتلقى إشعارات لأنك تراقب وسمًا في هذا الموضوع."
+          "3_10_stale": "ستتلقى إشعارات لأنك كنت تراقب وسمًا في هذا الموضوع في الماضي."
           "3_6": "ستتلقى إشعارات لأنك تراقب هذه الفئة."
+          "3_6_stale": "ستتلقى إشعارات لأنك كنت تراقب هذه الفئة في الماضي."
           "3_5": "ستتلقى إشعارات لأنك بدأت في مراقبة هذا الموضوع تلقائيًا."
           "3_2": "ستتلقى إشعارات لأنك تراقب هذا الموضوع."
           "3_1": "ستتلقى إشعارات لأنك أنشأت هذا الموضوع."
           "3": "ستتلقى إشعارات لأنك تراقب هذا الموضوع."
           "2_8": "سترى عدد الردود الجديدة لأنك تتتبَّع هذه الفئة."
+          "2_8_stale": "سترى عدد الردود الجديدة لأنك كنت تتتبَّع هذه الفئة في الماضي."
           "2_4": "سترى عدد الردود الجديدة لأنك نشرت ردًا في هذا الموضوع."
           "2_2": "سترى عدد الردود الجديدة لأنك تتتبَّع هذا الموضوع."
           "2": 'سترى عدد الردود الجديدة لأنك <a href="%{basePath}/u/%{username}/preferences/notifications">قرأت هذا الموضوع</a>.'
@@ -2506,6 +2857,7 @@ ar:
         pin: "تثبيت الموضوع"
         unpin: "إلغاء تثبيت الموضوع"
         pin_globally: "تثبيت الموضوع بشكلٍ عام"
+        make_banner: "تحويل الموضوع إلى بانر"
         remove_banner: "إزالة الموضوع البانر"
       reply:
         title: "الرد"
@@ -2514,6 +2866,18 @@ ar:
         title: "المشاركة"
         extended_title: "مشاركة رابط"
         help: "شارِك رابطًا إلى هذا الموضوع"
+        instructions: "مشاركة رابط إلى هذا الموضوع:"
+        copied: "تم نسخ رابط الدعوة."
+        notify_users:
+          title: "إرسال إشعار"
+          instructions: "إرسال إشعار بشأن هذا الموضوع إلى المستخدمين التاليين:"
+          success:
+            zero: "تم إرسال إشعار بشأن هذا الموضوع إلى جميع المستخدمين بنجاح."
+            one: "تم إرسال إشعار بشأن هذا الموضوع إلى %{username} بنجاح."
+            two: "تم إرسال إشعار بشأن هذا الموضوع إلى جميع المستخدمين بنجاح."
+            few: "تم إرسال إشعار بشأن هذا الموضوع إلى جميع المستخدمين بنجاح."
+            many: "تم إرسال إشعار بشأن هذا الموضوع إلى جميع المستخدمين بنجاح."
+            other: "تم إرسال إشعار بشأن هذا الموضوع إلى جميع المستخدمين بنجاح."
         invite_users: "دعوة"
       print:
         title: "الطباعة"
@@ -2582,6 +2946,7 @@ ar:
         username_placeholder: "اسم المستخدم"
         action: "إرسال دعوة"
         help: "دعوة الآخرين إلى هذا الموضوع عبر البريد الإلكتروني أو الإشعارات"
+        to_forum: "سنُرسل رسالة إلكترونية مختصرة تسمح لصديقك بالانضمام فورًا بالنقر على رابط."
         discourse_connect_enabled: "أدخِل اسم المستخدم للشخص الذي تريد دعوته إلى هذا الموضوع."
         to_topic_blank: "أدخِل اسم المستخدم أو عنوان البريد الإلكتروني للشخص الذي تريد دعوته إلى هذا الموضوع."
         to_topic_email: "لقد أدخلت عنوان بريد إلكتروني. سنُرسل دعوة عبر البريد الإلكتروني تتيح لصديقك الرد فورًا على هذا الموضوع."
@@ -2725,18 +3090,22 @@ ar:
           few: "لقد حدَّدت <b>%{count}</b> منشورات."
           many: "لقد حدَّدت <b>%{count}</b> منشورًا."
           other: "لقد حدَّدت <b>%{count}</b> منشور."
+      deleted_by_author_simple: "(تم حذف الموضوع بواسطة الكاتب)"
     post:
       quote_reply: "اقتباس"
       quote_share: "مشاركة"
       edit_reason: "السبب: "
       post_number: "المنشور %{number}"
       ignored: "محتوى تم تجاهله"
+      wiki_last_edited_on: "تم تعديل Wiki آخر مرة في %{dateTime}"
+      last_edited_on: "تم تعديل المنشور آخر مرة في %{dateTime}"
       reply_as_new_topic: "الرد كموضوع مرتبط"
       reply_as_new_private_message: "الرد في رسالة جديدة إلى المستلمين أنفسهم"
       continue_discussion: "متابعة المناقشة من %{postLink}:"
       follow_quote: "انتقل إلى المنشور الذي تم اقتباسه"
       show_full: "عرض المنشور الكامل"
       show_hidden: "عرض المحتوى الذي تم تجاهله"
+      deleted_by_author_simple: "(تم حذف المنشور بواسطة الكاتب)"
       collapse: "طي"
       expand_collapse: "توسيع/طي"
       locked: "قفل أحد أعضاء فريق العمل تعديل هذه المشاركة"
@@ -2775,7 +3144,22 @@ ar:
         few: "لقد سجَّلت إعجابك أنت و%{count} أشخاص آخرين بهذا المنشور"
         many: "لقد سجَّلت إعجابك أنت و%{count} شخصًا آخر بهذا المنشور"
         other: "لقد سجَّلت إعجابك أنت و%{count} شخص آخر بهذا المنشور"
+      filtered_replies_hint:
+        zero: "عرض هذا المنشور وردوده %{count}"
+        one: "عرض هذا المنشور والرد عليه"
+        two: "عرض هذا المنشور وردَّين (%{count}) عليه"
+        few: "عرض هذا المنشور و%{count} ردود عليه"
+        many: "عرض هذا المنشور و%{count} ردًا عليه"
+        other: "عرض هذا المنشور و%{count} رد عليه"
+      filtered_replies_viewing:
+        zero: "عرض رد %{count} على"
+        one: "يتم عرض رد واحد (%{count}) على"
+        two: "يتم عرض ردَّين (%{count}) رد على"
+        few: "يتم عرض %{count} ردود على"
+        many: "يتم عرض %{count} ردًا على"
+        other: "يتم عرض %{count} رد على"
       in_reply_to: "تحميل المنشور الرئيسي"
+      view_all_posts: "عرض جميع المنشورات"
       errors:
         create: "عذرًا، حدث خطأ في أثناء إنشاء منشورك. يُرجى إعادة المحاولة."
         edit: "عذرا، حدث خطأ في أثناء تعديل منشورك. يُرجى إعادة المحاولة."
@@ -2793,6 +3177,11 @@ ar:
         image_upload_not_allowed_for_new_user: "عذرًا، لا يمكن للمستخدمين الجُدد تحميل الصور."
         attachment_upload_not_allowed_for_new_user: "عذرًا، لا يمكن للمستخدمين الجُدد تحميل المرفقات."
         attachment_download_requires_login: "عذرًا، عليك تسجيل الدخول لتنزيل المرفقات."
+      cancel_composer:
+        confirm: "ماذا تريد أن تفعل بمنشورك؟"
+        discard: "تجاهل"
+        save_draft: "حفظ المسودة لوقتٍ لاحق"
+        keep_editing: "الاستمرار في التعديل"
       via_email: "لقد وصل هذا المنشور عبر البريد الإلكتروني"
       via_auto_generated_email: "لقد وصل هذا المنشور عبر رسالة إلكترونية تم إنشاؤها تلقائيًا"
       whisper: "هذا المنشور عبارة عن همسة خاصة للمشرفين"
@@ -2846,6 +3235,13 @@ ar:
         unlock_post_description: "اسمح لكاتب المشاركة تعديلها"
         delete_topic_disallowed_modal: "ليس لديك إذن بحذف هذا الموضوع. إذا كنت تريد حقًا حذفه، فأبلِغ عنه مع ذكر السبب للفت انتباه أحد المشرفين إليه."
         delete_topic_disallowed: "ليس لديك الإذن بحذف هذا الموضوع"
+        delete_topic_confirm_modal:
+          zero: "هذا الموضوع يحتوي حاليا على أكثر من %{count} مشاهدة، وقد يكون مشهورًا في نتائج البحث. هل متأكد من حذف هذا الموضوع بالكامل، بدلاً من تعديله لتحسينه؟"
+          one: "يحتوي هذا الموضوع حاليًا على أكثر من مرة عرض واحدة (%{count})، وقد يصبح رائجًا في نتائج البحث. هل تريد بالتأكيد حذف هذا الموضوع بالكامل بدلًا من تعديله لتحسينه؟"
+          two: "هذا الموضوع يحتوي حاليا على أكثر من %{count} مشاهدة، وقد يكون مشهورًا في نتائج البحث. هل متأكد من حذف هذا الموضوع بالكامل، بدلاً من تعديله لتحسينه؟"
+          few: "هذا الموضوع يحتوي حاليا على أكثر من %{count} مشاهدة، وقد يكون مشهورًا في نتائج البحث. هل متأكد من حذف هذا الموضوع بالكامل، بدلاً من تعديله لتحسينه؟"
+          many: "هذا الموضوع يحتوي حاليا على أكثر من %{count} مشاهدة، وقد يكون مشهورًا في نتائج البحث. هل متأكد من حذف هذا الموضوع بالكامل، بدلاً من تعديله لتحسينه؟"
+          other: "هذا الموضوع يحتوي حاليا على أكثر من %{count} مشاهدة، وقد يكون مشهورًا في نتائج البحث. هل متأكد من حذف هذا الموضوع بالكامل، بدلاً من تعديله لتحسينه؟"
         delete_topic_confirm_modal_yes: "نعم، حذف هذا الموضوع"
         delete_topic_confirm_modal_no: "لا، الاحتفاظ بهذا الموضوع"
         delete_topic_error: "حدث خطأ في أثناء حذف هذا الموضوع"
@@ -2854,6 +3250,7 @@ ar:
         change_post_notice: "تغيير إشعار فريق العمل"
         delete_post_notice: "حذف إشعار فريق العمل"
         remove_timer: "إزالة المؤقِّت"
+        edit_timer: "تعديل المؤقِّت"
       actions:
         people:
           like:
@@ -2954,6 +3351,12 @@ ar:
           edit_bookmark:
             name: "تعديل الإشارة المرجعية"
             description: "تعديل اسم الإشارة المرجعية أو تغيير تاريخ التذكير ووقته"
+          pin_bookmark:
+            name: "تثبيت الإشارة المرجعية"
+            description: "ثبِّت هذه الإشارة المرجعية. سيؤدي ذلك إلى ظهورها في أعلى قائمة الإشارات المرجعية لديك."
+          unpin_bookmark:
+            name: "إلغاء تثبيت الإشارة المرجعية"
+            description: "قم بإلغاء تثبيت هذه الإشارة المرجعية. ولن تظهر في أعلى قائمة الإشارات المرجعية لديك بعد الآن."
       filtered_replies:
         viewing_posts_by: "يتم الآن عرض %{post_count} منشور بواسطة"
         viewing_subset: "بعض الردود مطوية"
@@ -3034,6 +3437,7 @@ ar:
       num_featured_topics: "عدد الموضوعات المعروضة في صفحة الفئات:"
       subcategory_num_featured_topics: "عدد الموضوعات المميزة في صفحة الفئة الرئيسية."
       all_topics_wiki: "تحويل الموضوعات الجديدة إلى Wiki بشكلٍ افتراضي"
+      allow_unlimited_owner_edits_on_first_post: "السماح للمالك بعدد غير محدود من التعديلات على أول منشور"
       subcategory_list_style: "نمط قائمة الفئات الفرعية:"
       sort_order: "ترتيب قائمة الموضوعات حسب:"
       default_view: "قائمة الموضوعات الافتراضية:"
@@ -3057,16 +3461,19 @@ ar:
       notifications:
         watching:
           title: "المراقبة"
+          description: "ستراقب تلقائيًا جميع الموضوعات في هذه الفئة. وسيتم إرسال إشعار إليك بكل منشور جديد في كل موضوع، وسيتم عرض عدد الردود الجديدة."
         watching_first_post:
           title: "مراقبة أول منشور"
           description: "سنُرسل إليك إشعارًا بالموضوعات الجديدة في هذه الفئة، ولكن ليس الردود على الموضوعات."
         tracking:
           title: "المتابعة"
+          description: "ستتتبَّع تلقائيًا جميع الموضوعات في هذه الفئة. وسيتم إرسال إشعار إليك إذا أشار إليك شخص ما @name أو ردَّ عليك، وسيتم عرض عدد الردود الجديدة."
         regular:
           title: "عادي"
           description: "سنُرسل إليك إشعارًا إذا أشار أحد إلى اسمك باستخدام الرمز @ أو ردَّ عليك."
         muted:
           title: "الكتم"
+          description: "لن يتم إرسال إشعار إليك أبدًا بأي شيء يتعلَّق بالموضوعات الجديدة في هذه الفئة، ولن تظهر في الموضوعات الحديثة."
       search_priority:
         label: "أولوية البحث"
         options:
@@ -3101,6 +3508,7 @@ ar:
       list_filters:
         all: "جميع الموضوعات"
         none: "لا توجد فئات فرعية"
+      colors_disabled: "لا يمكنك تحديد الألوان لأنه ليس لديك نمط فئة."
     flagging:
       title: "نشكرك على مساعدتك في الحفاظ على مجتمعنا متحضرًا."
       action: "الإبلاغ عن المنشور"
@@ -3118,6 +3526,8 @@ ar:
       notify_action: "رسالة"
       official_warning: "تحذير رسمي"
       delete_spammer: "حذف صاحب الأسلوب غير المرغوب فيه"
+      flag_for_review: "قائمة انتظار المراجعة"
+      delete_confirm_MF: "أنت على وشك حذف {POSTS, plural, zero {<b>#</b> منشور} one {منشور واحد (<b>#</b>)} two {منشوران (<b>#</b>)} few {<b>#</b> منشورات} many {<b>#</b> منشورًا} other {<b>#</b> منشور}} و{TOPICS, plural, zero {<b>#</b> موضوع} one {موضوع واحد (<b>#</b>)} two {موضوعان (<b>#</b>)} few {<b>#</b> موضوعات} many {<b>#</b> موضوعًا} other {<b>#</b> موضوع}} من هذا المستخدم، وإزالة حسابه، وحظر عمليات الاشتراك من عنوان IP الخاص به <b>{ip_address}</b>، وإضافة عنوان بريده الإلكتروني <b>{email}</b> إلى قائمة الحظر الدائمة. هل أنت متأكد من أن هذا المستخدم هو بالفعل صاحب الأسلوب غير المرغوب فيه؟"
       yes_delete_spammer: "نعم، حذف صاحب الأسلوب غير المرغوب فيه"
       ip_address_missing: "(لا يوجد)"
       hidden_email_address: "(مخفي)"
@@ -3159,7 +3569,7 @@ ar:
       notify_action: "رسالة"
     topic_map:
       title: "ملخص الموضوع"
-      participants_title: "الناشرون الدائمون"
+      participants_title: "الناشرون المتكررون"
       links_title: "الروابط الرائجة"
       links_shown: "عرض المزيد من الروابط..."
       clicks:
@@ -3204,6 +3614,12 @@ ar:
         title: "هذا الموضوع عبارة عن رسالة خاصة"
         help: "هذا الموضوع عبارة عن رسالة خاصة"
     posts: "المنشورات"
+    posts_likes_MF: |
+      يتضمَّن هذا الموضوع {count, plural, zero {# رد} one {ردًا واحدًا (#)} two {ردَّين (#)} few {# ردود} many {# ردًا} other {# رد}} {ratio, select,
+        low {بمعدل إعجابات مرتفع على المنشورات}
+        med {بمعدل إعجابات مرتفع جدًا على المنشورات}
+        high {بمعدل إعجابات مرتفع للغاية على المنشورات}
+        other {}}
     original_post: "المنشور الأصلي"
     views: "مرات العرض"
     views_lowercase:
@@ -3239,6 +3655,7 @@ ar:
       many: "مستخدمًا"
       other: "مستخدم"
     category_title: "الفئة"
+    history: "السجل، آخر 100 مراجعة"
     changed_by: "بواسطة %{author}"
     raw_email:
       title: "البريد الوارد"
@@ -3350,6 +3767,7 @@ ar:
       close: "إغلاق (Esc)"
       content_load_error: 'تعذَّر تحميل <a href="%url%">المحتوى</a>.'
       image_load_error: 'تعذَّر تحميل <a href="%url%">الصورة</a>.'
+    cannot_render_video: لا يمكن عرض هذا الفيديو لأن متصفحك لا يدعم برنامج الترميز.
     keyboard_shortcuts_help:
       shortcut_key_delimiter_comma: ", "
       shortcut_key_delimiter_plus: "+"
@@ -3388,6 +3806,7 @@ ar:
         show_incoming_updated_topics: "%{shortcut} عرض الموضوعات المحدَّثة"
         search: "%{shortcut} البحث"
         help: "%{shortcut} فتح مساعدة لوحة المفاتيح"
+        dismiss_new: "%{shortcut} تجاهل الجديد"
         dismiss_topics: "%{shortcut} تجاهل الموضوعات"
         log_out: "%{shortcut} تسجيل الخروج"
       composing:
@@ -3481,6 +3900,9 @@ ar:
           name: أخرى
         posting:
           name: النشر
+      favorite_max_reached: "لا يمكنك تفضيل المزيد من الشارات."
+      favorite_max_not_reached: "وضع علامة على هذه الشارة كمفضَّلة"
+      favorite_count: "تم وضع علامة على %{count}/%{max} شارة كمفضَّلة"
     tagging:
       all_tags: "كل الوسوم"
       other_tags: "وسوم أخرى"
@@ -3490,6 +3912,7 @@ ar:
       tags: "الوسوم"
       choose_for_topic: "الوسوم الاختيارية"
       info: "المعلومات"
+      default_info: "هذا الوسم ليس مقصورًا على أي فئات وليس له أي مرادفات. لإضافة قيود، ضع هذا الوسم في <a href=٪{basePath}/tag_groups>مجموعة وسوم</a>."
       category_restricted: "هذا الوسم مقيَّد بالفئات التي ليس لديك إذن بالوصول إليها."
       synonyms: "المرادفات"
       synonyms_description: "عند استخدام الوسوم التالية، سيتم استبدالها بالوسم <b>%{base_tag_name}</b>."
@@ -3562,6 +3985,7 @@ ar:
         many: "%{tags} و%{count} وسمًا آخر"
         other: "%{tags} و%{count} وسم آخر"
       delete_no_unused_tags: "لا توجد وسوم غير مستخدمة:"
+      tag_list_joiner: "، "
       delete_unused: "حذف الوسوم غير المستخدمة"
       delete_unused_description: "حذف جميع الوسوم غير المرتبطة بأي موضوعات أو رسائل خاصة"
       cancel_delete_unused: "إلغاء"
@@ -3588,15 +4012,29 @@ ar:
           description: "لن تتلقى أي إشعارات أبدًا بخصوص الموضوعات الجديدة التي تحمل هذا الوسم، ولن تظهر في علامة تبويب الموضوعات غير المقروءة."
       groups:
         title: "مجموعات الوسوم"
+        about_heading: "حدِّد مجموعة وسوم أو أنشئ مجموعة جديدة"
+        about_heading_empty: "أنشئ مجموعة وسوم جديدة للبدء"
+        about_description: "تساعدك مجموعات الوسوم في إدارة الأذونات للعديد من الوسوم في مكانٍ واحد."
         new: "مجموعة جديدة"
+        new_title: "إنشاء مجموعة جديدة"
+        edit_title: "تعديل مجموعة الوسوم"
+        tags_label: "الوسوم في هذه المجموعة"
+        parent_tag_label: "الوسم الرئيسي"
+        parent_tag_description: "لا يمكن استخدام الوسوم من هذه المجموعة إلا في حال وجود الوسم الرئيسي."
         one_per_topic_label: "تحديد وسم واحد فقط لكل موضوع من هذه المجموعة"
         new_name: "مجموعة وسوم جديدة"
+        name_placeholder: "الاسم"
         save: "حفظ"
         delete: "حذف"
         confirm_delete: "هل تريد بالتأكيد حذف مجموعة الوسوم هذه؟"
         everyone_can_use: "يمكن للجميع استخدام الوسوم"
         usable_only_by_groups: "تكون الوسوم مرئية للجميع، ولكن يمكن للمجموعات التالية فقط استخدامها"
         visible_only_to_groups: "تكون الوسوم مرئية للمجموعات التالية فقط"
+        cannot_save: "لا يمكن حفظ مجموعة الوسوم. تأكَّد من وجود وسم واحد على الأقل، وأن اسم مجموعة الوسوم ليس فارغًا، وأن هناك مجموعة محدَّدة لمنحها إذن الوسوم."
+        tags_placeholder: "البحث أو إنشاء الوسوم"
+        parent_tag_placeholder: "اختياري"
+        select_groups_placeholder: "تحديد المجموعات..."
+        disabled: "وضع الوسوم معطَّل. "
       topics:
         none:
           unread: "ليس لديك أي موضوع غير مقروء."
@@ -3609,9 +4047,11 @@ ar:
     invite:
       custom_message: "جعل دعوتك أكثر اتسامًا بالطابع الشخصي عن طريق كتابة <a href>رسالة مخصَّصة</a>."
       custom_message_placeholder: "أدخِل رسالتك المخصَّصة"
+      approval_not_required: "ستتم الموافقة تلقائيًا على المستخدم بمجرد قبوله لهذه الدعوة."
       custom_message_template_forum: "مرحبًا. يجب عليك الانضمام إلى هذا المنتدى!"
       custom_message_template_topic: "مرحبًا. أظن أنك ستستمتع بهذا الموضوع!"
     forced_anonymous: "بسبب الضغط الشديد، يتم عرض هذا الموضوع للجميع مؤقتًا كما يراه مستخدم سجَّل الخروج."
+    forced_anonymous_login_required: "الموقع تحت ضغط شديد ولا يمكن تحميله في الوقت الحالي، حاول مرة أخرى في غضون بضع دقائق."
     footer_nav:
       back: "للخلف"
       forward: "للأمام"
@@ -3630,6 +4070,7 @@ ar:
         two_hours: "ساعتان"
         tomorrow: "حتى الغد"
         custom: "مخصَّص"
+      set_schedule: "ضبط جدول الإشعارات"
     trust_levels:
       names:
         newuser: "مستخدم جديد"
@@ -3665,16 +4106,21 @@ ar:
         latest_version: "الحديثة"
         problems_found: "بعض النصائح بناءً على إعدادات موقعك الحالية"
         new_features:
+          title: "\U0001F381 الميزات الجديدة"
           dismiss: "تجاهل"
+          learn_more: "معرفة المزيد"
         last_checked: "تاريخ آخر تحقُّق"
         refresh_problems: "تحديث"
         no_problems: "لم يتم العثور على مشكلات."
         moderators: "المشرفون:"
         admins: "المسؤولون:"
+        silenced: "المكتومون:"
         suspended: "المعلَّقون:"
         private_messages_short: "الرسائل"
         private_messages_title: "الرسائل"
         mobile_title: "الجوَّال"
+        space_used: "تم استخدام %{usedSize}"
+        space_used_and_free: "%{usedSize} (%{freeSize} فارغة)"
         uploads: "التحميلات"
         backups: "النسخ الاحتياطية"
         backup_count:
@@ -3684,18 +4130,30 @@ ar:
           few: "%{count} نسخ احتياطية في %{location}"
           many: "%{count} نسخة احتياطية في %{location}"
           other: "%{count} نسخة احتياطية في %{location}"
+        lastest_backup: "تاريخ آخر نسخ احتياطي: %{date}"
         traffic_short: "الزيارات"
         traffic: "طلبات الويب للتطبيق"
         page_views: "مرات عرض الصفحة"
         page_views_short: "مرات عرض الصفحة"
         show_traffic_report: "عرض تقرير مفصَّل عن الزيارات"
+        community_health: صحة المجتمع
+        moderators_activity: نشاط المشرفين
         whats_new_in_discourse: ما الجديد في Discourse؟
+        activity_metrics: مقاييس النشاط
+        all_reports: "جميع التقارير"
         general_tab: "عام"
         moderation_tab: "الإشراف"
         security_tab: "الأمان"
+        reports_tab: "التقارير"
         report_filter_any: "أي"
+        disabled: معطَّل
+        timeout_error: عذرًا، يستغرق الاستعلام وقتًا طويلًا، يُرجى اختيار فترة زمنية أقصر
+        exception_error: عذرًا، حدث خطأ في أثناء تنفيذ الاستعلام
         too_many_requests: لقد نفَّذت هذا الإجراء مرات كثيرة جدًا. يُرجى الانتظار قليلًا قبل إعادة المحاولة.
+        not_found_error: عذرًا، هذا التقرير غير موجود
+        filter_reports: تصفية التقارير
         reports:
+          trend_title: "تغيير بنسبة %{percent}. الحالي %{current}، كان %{prev} في فترة سابقة."
           today: "اليوم"
           yesterday: "أمس"
           last_7_days: "آخر 7"
@@ -3710,10 +4168,17 @@ ar:
           daily: يوميًا
           monthly: شهريًا
           weekly: أسبوعيًا
+          dates: "التواريخ (بالتوقيت العالمي الموحَّد)"
           groups: "كل المجموعات"
           disabled: "هذا التقرير متوقف"
+          totals_for_sample: "إجماليات العينة"
+          average_for_sample: "متوسط العينة"
           total: "إجمالي الوقت الكلي"
           no_data: "لا توجد بيانات لعرضها."
+          trending_search:
+            more: '<a href="%{basePath}/admin/logs/search_logs">سجلات البحث</a>'
+            disabled: 'تقرير عبارات البحث الرائجة معطَّل. فعِّل <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">تسجيل استعلامات البحث</a> لجمع البيانات.'
+          average_chart_label: المتوسط
           filters:
             file_extension:
               label: امتداد الملف
@@ -3721,6 +4186,8 @@ ar:
               label: المجموعة
             category:
               label: الفئة
+            include_subcategories:
+              label: "تضمين الفئات الفرعية"
       groups:
         new:
           title: "مجموعة جديدة"
@@ -3737,17 +4204,32 @@ ar:
             email: البريد الإلكتروني
             incoming_email: "عنوان مخصَّص للبريد الوارد"
             incoming_email_placeholder: "أدخل عنوان البريد الإلكتروني"
+            visibility: الرؤية
             visibility_levels:
               title: "من يمكنه رؤية هذه المجموعة؟"
               public: "الجميع"
+              logged_on_users: "المستخدمون الذين سجَّلوا الدخول"
+              members: "مالكو المجموعة والأعضاء والمشرفين"
+              staff: "مالكو المجموعة والمشرفين"
+              owners: "مالكو المجموعة"
+              description: "يمكن للمسؤولين رؤية جميع المجموعات."
             members_visibility_levels:
               title: "من يمكنه رؤية أعضاء هذه المجموعة؟"
               description: "يمكن للمسؤولين رؤية أعضاء كل المجموعات."
+            publish_read_state: "نشر حالة قراءة المجموعة على رسائل المجموعة"
           membership:
             automatic: تلقائية
             trust_levels_title: "مستوى الثقة الذي يتم منحه للأعضاء تلقائيًا عند إضافتهم:"
+            effects: التأثيرات
             trust_levels_none: "لا يوجد"
             automatic_membership_email_domains: "ستتم إضافة المستخدمين الذين يسجِّلون بنطاق بريد إلكتروني مطابق لنطاق في هذه القائمة إلى هذه المجموعة تلقائيًا:"
+            automatic_membership_user_count:
+              zero: "يوجد %{count} مستخدم لديه نطاقات البريد الإلكتروني الجديدة وستتم إضافته إلى المجموعة."
+              one: "يوجد مستخدم واحد (%{count}) لديه نطاقات البريد الإلكتروني الجديدة وستتم إضافته إلى المجموعة."
+              two: "يوجد مستخدمان (%{count}) لديهما نطاقات البريد الإلكتروني الجديدة وستتم إضافتهما إلى المجموعة."
+              few: "يوجد %{count} مستخدمين لديهم نطاقات البريد الإلكتروني الجديدة وستتم إضافتهم إلى المجموعة."
+              many: "يوجد %{count} مستخدمًا لديهم نطاقات البريد الإلكتروني الجديدة وستتم إضافته إلى المجموعة."
+              other: "يوجد %{count} مستخدم لديه نطاقات البريد الإلكتروني الجديدة وستتم إضافته إلى المجموعة."
             primary_group: "الضبط تلقائيًا كمجموعة أساسية"
         name_placeholder: "اسم المجموعة بلا مسافات، على غرار قاعدة اسم المستخدم"
         primary: "المجموعة الأساسية"
@@ -3759,11 +4241,21 @@ ar:
         group_members: "أعضاء المجموعة"
         delete: "حذف"
         delete_confirm: "هل تريد حذف هذه المجموعة؟"
+        delete_with_messages_confirm:
+          zero: "سيؤدي حذف هذه المجموعة إلى عزل %{count} رسالة، ولن يتمكن أعضاء المجموعة من الوصول إليها مرة أخرى.<br><br>هل أنت متأكد؟"
+          one: "سيؤدي حذف هذه المجموعة إلى عزل رسالة واحدة (%{count})، ولن يتمكن أعضاء المجموعة من الوصول إليها مرة أخرى.<br><br>هل أنت متأكد؟"
+          two: "سيؤدي حذف هذه المجموعة إلى عزل رسالتَين (%{count})، ولن يتمكن أعضاء المجموعة من الوصول إليهما مرة أخرى.<br><br>هل أنت متأكد؟"
+          few: "سيؤدي حذف هذه المجموعة إلى عزل %{count} رسائل، ولن يتمكن أعضاء المجموعة من الوصول إليها مرة أخرى.<br><br>هل أنت متأكد؟"
+          many: "سيؤدي حذف هذه المجموعة إلى عزل %{count} رسالة، ولن يتمكن أعضاء المجموعة من الوصول إليها مرة أخرى.<br><br>هل أنت متأكد؟"
+          other: "سيؤدي حذف هذه المجموعة إلى عزل %{count} رسالة، ولن يتمكن أعضاء المجموعة من الوصول إليها مرة أخرى.<br><br>هل أنت متأكد؟"
         delete_failed: "يتعذَّر حذف المجموعة. إذا كانت هذه مجموعة تلقائية، فلا يمكن تدميرها."
+        delete_automatic_group: هذه مجموعة تلقائية ولا يمكن حذفها.
         delete_owner_confirm: "هل تريد إزالة صلاحيات المالك من \"%{username}\"؟"
         add: "إضافة"
         custom: "مخصَّصة"
         automatic: "تلقائية"
+        default_title: "العنوان الافتراضي"
+        default_title_description: "سيتم تطبيقه على جميع المستخدمين في المجموعة"
         group_owners: المالكون
         add_owners: إضافة مالكين
         none_selected: "حدِّد مجموعة للبدء"
@@ -3773,9 +4265,13 @@ ar:
         none: "لا توجد مفاتيح API نشطة حاليًا."
         user: "المستخدم"
         title: "API"
+        key: "المفتاح"
         created: تاريخ الإنشاء
         updated: تاريخ التحديث
+        last_used: آخر استخدام
+        never_used: (أبدًا)
         generate: "إنشاء"
+        undo_revoke: "التراجع عن الإلغاء"
         revoke: "إلغاء"
         all_users: "جميع المستخدمين"
         active_keys: "مفاتيح API النشطة"
@@ -3785,14 +4281,47 @@ ar:
         no_description: (لا يوجد وصف)
         all_api_keys: جميع مفاتيح API
         user_mode: مستوى المستخدم
+        impersonate_all_users: انتحال شخصية أي مستخدم
+        single_user: "مستخدم فردي"
         user_placeholder: أدخِل اسم المستخدم
         description_placeholder: ما الذي سيتم استخدام هذا المفتاح فيه؟
         save: حفظ
         new_key: مفتاح API جديد
         revoked: تم الإلغاء
+        delete: الحذف بشكلٍ دائم
+        not_shown_again: لن يتم عرض هذا المفتاح مرة أخرى. تأكَّد من أخذ نسخة قبل المتابعة.
         continue: متابعة
+        use_global_key: المفتاح العام (يسمح بجميع الإجراءات)
         scopes:
+          description: |
+            عند استخدام النطاقات، يمكنك تقييد مفتاح API على مجموعة محدَّدة من نقاط النهاية.
+            يمكنك أيضًا تحديد المعلمات التي سيتم السماح بها. استخدم الفاصلات للفصل بين القيم المتعددة.
+          title: النطاقات
+          resource: المورد
           action: الإجراء
+          allowed_parameters: المعلمات المسموح بها
+          optional_allowed_parameters: المعلمات المسموح بها (اختياري)
+          any_parameter: (أي معلمة)
+          allowed_urls: عناوين URL المسموح بها
+          descriptions:
+            topics:
+              read: قراءة موضوع أو منشور محدَّد فيه. يتم دعم RSS أيضًا.
+              write: إنشاء موضوع جديد أو النشر في موضوع موجود
+              read_lists: قراءة قوائم الموضوعات مثل الأكثر عرضًا، والجديدة، والحديثة، وما إلى ذلك. يتم دعم RSS أيضًا.
+              wordpress: ضرورية لكي يعمل المكوِّن الإضافي wp-discourse على WordPress.
+            posts:
+              edit: تعديل أي منشور أو منشور معيَّن.
+            users:
+              bookmarks: إدراج الإشارات المرجعية للمستخدم. تعرض تذكيرات بالإشارات المرجعية عند استخدام تنسيق ICS.
+              sync_sso: مزامنة مستخدم باستخدام DiscourseConnect
+              show: الحصول على معلومات عن مستخدم
+              check_emails: إدراج عناوين البريد الإلكتروني للمستخدمين
+              update: تحديث معلومات الملف الشخصي لمستخدم
+              log_out: تسجيل الخروج من جميع الجلسات لمستخدم
+              anonymize: إخفاء هوية حسابات المستخدمين
+              delete: حذف حسابات المستخدمين
+            email:
+              receive_emails: ادمج هذا النطاق مع مستقبل البريد لمعالجة الرسائل الإلكترونية الواردة.
       web_hooks:
         title: "خطافات الويب"
         none: "لا توجد خطافات ويب حاليًا."
@@ -3807,6 +4336,7 @@ ar:
         go_back: "العودة إلي القائمة"
         payload_url: "عنوان URL للحمولة"
         payload_url_placeholder: "https://example.com/postreceive"
+        warn_local_payload_url: "يبدو أنك تحاول إعداد خطاف ويب على عنوان URL محلي. قد يتسبَّب تسليم الحدث إلى عنوان محلي في حدوث آثار جانبية أو سلوكيات غير متوقعة. هل تريد المتابعة؟"
         secret_invalid: "يجب ألا يحتوي الرمز السري على حروف فارغة."
         secret_too_short: "يجب ألا يقل الرمز السري عن 12 حرفًا."
         secret_placeholder: "سلسلة اختيارية، تُستخدَم في إنشاء توقيع إلكتروني"
@@ -3819,17 +4349,55 @@ ar:
         verify_certificate: "التحقُّق من شهادة TLS لعنوان URL للحمولة"
         active: "نشط"
         active_notice: "سنُرسل تفاصيل الحدث عند وقوعه."
+        categories_filter_instructions: "لن يتم تشغيل خطافات الويب ذات الصلة إلا إذا كان الحدث مرتبطًا بفئات محدَّدة. اتركه فارغًا لتشغيل خطافات الويب لجميع الفئات."
+        categories_filter: "الفئات المشغَّلة"
+        tags_filter_instructions: "لن يتم تشغيل خطافات الويب ذات الصلة إلا إذا كان الحدث مرتبطًا بوسوم محدَّدة. اتركه فارغًا لتشغيل خطافات الويب لجميع الوسوم."
+        tags_filter: "الوسوم المشغَّلة"
+        groups_filter_instructions: "لن يتم تشغيل خطافات الويب ذات الصلة إلا إذا كان الحدث مرتبطًا بمجموعات محدَّدة. اتركه فارغًا لتشغيل خطافات الويب لجميع المجموعات."
+        groups_filter: "المجموعات المشغَّلة"
+        delete_confirm: "هل تريد حذف خطاف الويب هذا؟"
         topic_event:
           name: "حدث الموضوع"
+          details: "عندما يكون هناك موضوع جديد، أو تمت مراجعته أو تغييره أو حذفه."
+        post_event:
+          name: "حدث المنشور"
+          details: "عندما يكون هناك رد جديد، أو تم تعديله أو حذفه أو استعادته."
         user_event:
           name: "حدث المستخدم"
+          details: "عند تسجيل المستخدم للدخول أو الخروج، أو تأكيده لبريده الإلكتروني أو إنشائه أو الموافقة عليه أو تحديثه."
+        group_event:
+          name: "حدث المجموعة"
+          details: "عند إنشاء مجموعة أو تحديثها أو مسحها."
+        category_event:
+          name: "حدث الفئة"
+          details: "عند إنشاء فئة أو تحديثها أو مسحها."
+        tag_event:
+          name: "حدث الوسم"
+          details: "عند إنشاء وسم أو تحديثه أو مسحه."
+        reviewable_event:
+          name: "حدث العنصر القابل للمراجعة"
+          details: "عند وجود عنصر جديد جاهز للمراجعة وعند تحديث حالته."
+        notification_event:
+          name: "حدث الإشعار"
+          details: "عند تلقي المستخدم إشعار في موجزه."
+        user_badge_event:
+          name: "حدث منح الشارة"
+          details: "عند حصول المستخدم على شارة."
+        group_user_event:
+          name: "حدث مستخدم المجموعة"
+          details: "عند إضافة مستخدم أو إزالته في مجموعة."
+        like_event:
+          name: "حدث الإعجاب"
+          details: "عند تسجيل المستخدم إعجابه بمنشور."
         delivery_status:
           title: "حالة التسليم"
           inactive: "غير نشط"
           failed: "فشل"
           successful: "نجح"
+          disabled: "معطَّل"
         events:
           none: "لا توجد أحداث ذات صلة."
+          redeliver: "إعادة التسليم"
           incoming:
             zero: "هناك %{count} حدث جديد."
             one: "هناك حدث واحد جديد."
@@ -3846,9 +4414,12 @@ ar:
             other: "اكتمل خلال %{count} ثانية."
           request: "الطلب"
           response: "الاستجابة"
+          redeliver_confirm: "هل تريد بالتأكيد إعادة تسليم الحمولة نفسها؟"
           headers: "الرؤوس"
+          payload: "الحمولة"
           body: "النص"
           go_list: "الانتقال إلى القائمة"
+          go_details: "تعديل خطاف الويب"
           go_events: "الانتقال إلى الأحداث"
           ping: "اختبار الاتصال"
           status: "رمز الحالة"
@@ -3868,6 +4439,7 @@ ar:
         change_settings: "تغيير الإعدادات"
         change_settings_short: "الإعدادات"
         howto: "كيف يمكنني تثبيت الإضافات؟"
+        official: "المكوِّن الإضافي الرسمي"
       backups:
         title: "النسخ الاحتياطية"
         menu:
@@ -3905,6 +4477,7 @@ ar:
             label: "نسخة احتياطية"
             title: "إنشاء نسخة احتياطية"
             confirm: "هل تريد إنشاء نسخة احتياطية جديدة؟"
+            without_uploads: "نعم (عدم تضمين التحميلات)"
           download:
             label: "تنزيل"
             title: "مراسلتي عبر البريد الإلكتروني برابط التنزيل"
@@ -3967,64 +4540,121 @@ ar:
           revert_confirm: "هل تريد بالتأكيد التراجع عن التغييرات؟"
         theme:
           theme: "السمة"
+          component: "المكوِّن"
+          components: "المكوِّنات"
+          theme_name: "اسم السمة"
+          component_name: "اسم المكوِّن"
+          themes_intro: "حدِّد سمة موجودة أو ثبِّت سمة جديدة للبدء"
+          themes_intro_emoji: "الرمز التعبيري لفنانة"
+          beginners_guide_title: "دليل المبتدئين لاستخدام سمات Discourse"
+          developers_guide_title: "دليل المطوِّرين لاستخدام سمات Discourse"
+          browse_themes: "تصفُّح سمات المجتمع"
           customize_desc: "تخصيص:"
           title: "السمات"
           create: "إنشاء"
           create_type: "النوع"
           create_name: "الاسم"
+          long_title: "تعديل الألوان ومحتويات CSS وHTML لموقعك"
           edit: "تعديل"
+          edit_confirm: "هذه سمة بعيدة، إذا أجريت تعديلات على CSS/HTML، فسيتم مسح تغييراتك عند تحديث السمة في المرة التالية."
+          update_confirm: "سيؤدي التحديث إلى محو التغييرات المحلية. هل تريد بالتأكيد المتابعة؟"
+          update_confirm_yes: "نعم، متابعة التحديث"
           common: "مشترك"
           desktop: "سطح المكتب"
           mobile: "الجوَّال"
           settings: "الإعدادات"
           translations: "الترجمات"
+          extra_scss: "SCSS إضافية"
+          extra_files: "ملفات إضافية"
+          extra_files_upload: "يجب تصدير السمة لعرض هذه الملفات."
+          extra_files_remote: "يجب تصدير السمة أو التحقُّق من مستودع Git لعرض هذه الملفات."
           preview: "معاينة"
           show_advanced: "إظهار الحقول المتقدمة"
           hide_advanced: "إخفاء الحقول المتقدمة"
           hide_unused_fields: "إخفاء الحقول غير المستخدمة"
           is_default: "السمة مفعَّلة بشكلٍ افتراضي"
           user_selectable: "يمكن للمستخدمين تحديد السمة"
+          color_scheme_user_selectable: "يمكن تحديد نظام الألوان بواسطة المستخدمين"
+          auto_update: "التحديث التلقائي عند تحديث Discourse"
+          color_scheme: "لوحة الألوان"
+          default_light_scheme: "فاتحة (افتراضي)"
           color_scheme_select: "تحديد الألوان التي ستستخدمها السمة"
           custom_sections: "الأقسام المخصَّصة:"
           theme_components: "مكوِّنات السمة"
           add_all_themes: "إضافة جميع السمات"
+          convert: "تحويل"
           convert_component_alert: "هل تريد بالتأكيد تحويل هذا المكوِّن إلى سمة؟ ستتم إزالته كمكوِّن من %{relatives}."
+          convert_component_tooltip: "تحويل هذا المكوِّن إلى سمة"
+          convert_component_alert_generic: "هل تريد بالتأكيد تحويل هذا المكوِّن إلى سمة؟"
           convert_theme_alert: "هل تريد بالتأكيد تحويل هذه السمة إلى مكوِّن؟ ستتم إزالته كعنصر رئيسي من %{relatives}."
+          convert_theme_alert_generic: "هل تريد بالتأكيد تحويل هذه السمة إلى مكوِّن؟"
+          convert_theme_tooltip: "تحويل هذه السمة إلى مكوِّن"
           inactive_themes: "السمات غير النشطة:"
           inactive_components: "المكوِّنات غير المستخدمة:"
+          broken_theme_tooltip: "هذه السمة بها أخطاء في CSS أو HTML أو YAML"
           disabled_component_tooltip: "لقد تم إيقاف هذا المكوِّن"
           default_theme_tooltip: "هذه السمة هي السمة الافتراضية للموقع"
           updates_available_tooltip: "تتوفَّر تحديثات لهذه السمة"
+          and_x_more: "و%{count} أخرى."
           collapse: طي
           uploads: "التحميلات"
           no_uploads: "يمكنك تحميل الملفات المرتبطة بسمتك، مثل الخطوط والصور"
           add_upload: "إضافة ملف"
           upload_file_tip: "اختر ملفًا لتحميله (png، woff2، إلى آخره)"
           variable_name: "اسم متغير SCSS:"
+          variable_name_invalid: "اسم المتغير غير صالح. مسموح بالأحرف الأبجدية الرقمية فقط. يجب أن تبدأ بحرف. ويجب أن يكون فريدًا."
+          variable_name_error:
+            invalid_syntax: "اسم المتغير غير صالح. مسموح بالأحرف الأبجدية الرقمية فقط. يجب أن تبدأ بحرف."
+            no_overwrite: "اسم المتغير غير صالح. يجب ألا تستبدل متغيرًا موجودًا."
+            must_be_unique: "اسم المتغير غير صالح. يجب أن يكون فريدًا."
           upload: "تحميل"
+          select_component: "تحديد مكوِّن..."
+          unsaved_changes_alert: "لم تحفظ تغييراتك بعد، هل تريد تجاهلها والمضي قدمًا؟"
+          unsaved_parent_themes: "لم تخصِّص المكوِّن للسمات، هل تريد المضي قدمًا؟"
+          discard: "تجاهل"
+          stay: "البقاء"
           css_html: "CSS/HTML مخصَّص"
           edit_css_html: "تعديل CSS/HTML"
           edit_css_html_help: "لم تعدِّل CSS أو HTML"
           delete_upload_confirm: "هل تريد حذف هذا الملف؟ (قد يتوقف ملف CSS عن العمل!)"
+          component_on_themes: "تضمين العنصر في هذه السمات"
+          included_components: "المكوِّنات المضمَّنة"
+          add_all: "إضافة الكل"
           import_web_tip: "المستودع الذي يحتوي السمة"
+          direct_install_tip: "هل تريد بالتأكيد تثبيت <strong>%{name}</strong> من المستودع المُدرَج أدناه؟"
+          import_web_advanced: "متقدم..."
+          import_file_tip: "ملف .tar.gz, .zip, or .dcstyle.json الذي يحتوي على السمة"
+          is_private: "السمة موجودة في مستودع Git خاص"
           remote_branch: "اسم الفرع (اختياري)"
+          public_key: "امنح المفتاح العام التالي إذن الوصول إلى المستودع:"
+          public_key_note: "بعد إدخال عنوان URL صالح لمستودع خاص أعلاه، سيتم إنشاء مفتاح SSH وعرضه هنا."
           install: "تثبيت"
           installed: "مثبَّت"
           install_popular: "رائج"
           install_upload: "من جهازك"
           install_git_repo: "من مستودع Git"
+          install_create: "إنشاء جديد"
+          duplicate_remote_theme: "مكوِّن السمة \"%{name}\" مثبَّت بالفعل، هل تريد بالتأكيد تثبيت نسخة أخرى؟"
           about_theme: "نبذة"
           license: "الترخيص"
           version: "الإصدار:"
+          authors: "تم تأليفها بواسطة:"
+          creator: "تم إنشاؤها بواسطة:"
           source_url: "المصدر"
           enable: "تفعيل"
           disable: "إيقاف"
           disabled: "لقد تم إيقاف هذا المكوِّن."
           disabled_by: "لقد تم إيقاف هذا المكوِّن بواسطة"
+          required_version:
+            error: "تم إيقاف هذه السمة تلقائيًا لأنها غير متوافقة مع هذا الإصدار من Discourse."
+            minimum: "تتطلب الإصدار %{version} من Discourse أو أحدث."
+            maximum: "تتطلب الإصدار %{version} من Discourse أو أقدم."
+          component_of: "مكوِّن:"
           update_to_latest: "تحديث إلى الإصدار الأخير"
           check_for_updates: "التحقُّق من وجود تحديثات"
           updating: "جارٍ التحديث..."
           up_to_date: "السمة محدَّثة، تاريخ آخر تحقُّق:"
+          has_overwritten_history: "لم يعُد إصدار السمة الحالي موجودًا لأن سجل Git قد تم استبداله إجباريًا."
           add: "إضافة"
           theme_settings: "إعدادات السمة"
           no_settings: "لا توجد إعدادات لهذه السمة."
@@ -4038,6 +4668,7 @@ ar:
             many: "السمة متأخرة بعدد %{count} مساهمة!"
             other: "السمة متأخرة بعدد %{count} مساهمة!"
           compare_commits: "(عرض المساهمات الجديدة)"
+          remote_theme_edits: "إذا كنت ترغب في تعديل هذه السمة0، يجب عليك <a href='%{repoURL}' target='_blank'>طلب تغيير في مستودعها</a>"
           repo_unreachable: "تعذَّر الاتصال بمستودع Git لهذه السمة. رسالة الخطأ:"
           imported_from_archive: "تم استيراد هذه السمة من ملف ‎.zip"
           scss:
@@ -4054,15 +4685,29 @@ ar:
             title: "إدخال HTML للعرض في تذييل الصفحة"
           embedded_scss:
             text: "CSS المدمج"
+            title: "أدخل CSS مخصَّصة لتسليمها مع النسخة المضمَّنة من التعليقات"
           color_definitions:
             text: "تحديدات الألوان"
             title: "إدخال تحديدات الألوان المخصَّصة (للمستخدمين المتقدمين فقط)"
+            placeholder: |2-
+
+              استخدم ورقة الأنماط هذه لإضافة ألوان مخصَّصة إلى خصائص CSS المخصَّصة.
+
+              مثال:
+
+              %{example}
+
+              يوصى بشدة بوضع بادئة لأسماء الخصائص لتجنُّب تعارضها مع المكوِّنات الإضافية أو الأساسية.
           head_tag:
             text: "</‎head>"
             title: "HTML الذي سيتم إدراجه قبل وسم ‎</head>‎"
           body_tag:
             text: "</‎body>"
             title: "HTML الذي سيتم إدراجه قبل وسم ‎</body>‎"
+          yaml:
+            title: "تحديد إعدادات السمة بتنسيق YAML"
+          scss_color_variables_warning: 'تم التوقف عن استخدام متغيرات ألوان SCSS الأساسية في السمات. يُرجى استخدام خصائص CSS المخصَّصة بدلًا من ذلك. راجع <a href="https://meta.discourse.org/t/-/77551#color-variables-2" target="_blank">هذا الدليل</a> لمزيد من التفاصيل.'
+          scss_warning_inline: "تم التوقف عن استخدام متغيرات ألوان SCSS الأساسية في السمات."
         colors:
           select_base:
             title: "تحديد لوحة الألوان الأساسية"
@@ -4081,6 +4726,10 @@ ar:
           primary:
             name: "الأساسي"
             description: "أغلب النصوص، والأيقونات، والحدود."
+          primary-medium:
+            name: "أساسي متوسط"
+          primary-low-mid:
+            name: "أساسي تحت المتوسط"
           secondary:
             name: "الثانوي"
             description: "لون الخلفية الأساسي، ولون نصوص بعض الأزرار."
@@ -4099,6 +4748,12 @@ ar:
           highlight:
             name: "التمييز"
             description: "لون خلفية العناصر المميزة في الصفحة، كالمنشورات والموضوعات."
+          highlight-high:
+            name: "تمييز قوي"
+          highlight-medium:
+            name: "تمييز متوسط"
+          highlight-low:
+            name: "تمييز طفيف"
           danger:
             name: "الخطر"
             description: "لون تمييز الإجراءات مثل حذف المنشورات والموضوعات."
@@ -4110,20 +4765,29 @@ ar:
             description: "لون زر تسجيل الإعجاب."
         robots:
           title: "تجاوز ملف robots.txt لموقعك:"
+          warning: "سيؤدي ذلك إلى تجاوز أي إعدادات ذات صلة بالموقع بشكلٍ دائم."
+          overridden: تم تجاوز ملف robots.txt الافتراضي لموقعك.
         email_style:
           title: "نمط الرسالة الإلكترونية"
           heading: "تخصيص نمط الرسالة الإلكترونية"
           html: "نموذج HTML"
           css: "CSS"
           reset: "إعادة الضبط على الافتراضي"
+          reset_confirm: "هل تريد بالتأكيد إعادة الضبط إلى قيمة %{fieldName} الافتراضية وفقدان جميع التغييرات؟"
           save_error_with_reason: "لم يتم حفظ تغييراتك. %{error}"
+          instructions: "خصِّص النموذج الذي يتم فيه عرض جميع الرسائل الإلكترونية بتنسيق HTML، والنمط باستخدام CSS."
       email:
         title: "الرسائل الإلكترونية"
         settings: "الإعدادات"
         templates: "القوالب"
         preview_digest: "معاينة الملخص"
         advanced_test:
+          title: "الاختبار المتقدم"
+          desc: "استعرض كيف استقبلت عمليات Discourse الرسائل الإلكترونية. لتتمكن من معالجة الرسالة الإلكترونية بشكلٍ صحيح، يُرجى لصق الرسالة الإلكترونية الأصلية بالكامل أدناه."
           email: "الرسالة الأصلية"
+          run: "تشغيل الاختبار"
+          text: "نص الرسالة المحدَّد"
+          elided: "نص محذوف"
         sending_test: "جارٍ إرسال رسالة إلكترونية للاختبار..."
         error: "<b>خطأ</b> - %{server_error}"
         test_error: "حدثت مشكلة في أثناء إرسال الرسالة الإلكترونية للاختبار. يُرجى التأكد من إعدادات البريد الإلكتروني، والتحقُّق من أن المضيف لا يحجب اتصالات البريد الإلكتروني، وإعادة المحاولة."
@@ -4149,6 +4813,7 @@ ar:
         format: "التنسيق"
         html: "html"
         text: "النص"
+        html_preview: "معاينة محتوى الرسالة الإلكترونية"
         last_seen_user: "آخر ظهور لمستخدم:"
         no_result: "لم يتم العثور على نتائج للملخص."
         reply_key: "مفتاح الرد"
@@ -4182,6 +4847,8 @@ ar:
             type_placeholder: "الملخص، الاشتراك..."
             reply_key_placeholder: "مفتاح الرد"
       moderation_history:
+        performed_by: "أجراه"
+        no_results: "لا يتوفَّر سجل للإشراف."
         actions:
           delete_user: "تم حذف المستخدم"
           suspend_user: "تم تعليق المستخدم"
@@ -4232,10 +4899,13 @@ ar:
             change_site_text: "تغيير نص الموقع"
             suspend_user: "تعليق المستخدم"
             unsuspend_user: "إلغاء تعليق المستخدم"
+            removed_suspend_user: "تعليق المستخدم (تمت الإزالة)"
+            removed_unsuspend_user: "إلغاء تعليق المستخدم (تمت الإزالة)"
             grant_badge: "منح شارة"
             revoke_badge: "سحب الشارة"
             check_email: "التحقُّق من البريد الإلكتروني"
             delete_topic: "حذف الموضوع"
+            recover_topic: "إلغاء حذف الموضوع"
             delete_post: "حذف المنشور"
             impersonate: "الانتحال"
             anonymize_user: "مستخدم مجهول"
@@ -4243,12 +4913,17 @@ ar:
             change_category_settings: "تغيير إعدادات الفئة"
             delete_category: "حذف الفئة"
             create_category: "إنشاء فئة"
+            silence_user: "كتم المستخدم"
+            unsilence_user: "إلغاء كتم المستخدم"
+            removed_silence_user: "كتم المستخدم (تمت الإزالة)"
+            removed_unsilence_user: "إلغاء كتم المستخدم (تمت الإزالة)"
             grant_admin: "التعيين كمسؤول"
             revoke_admin: "إلغاء التعيين كمسؤول"
             grant_moderation: "منح صلاحيات الإشراف"
             revoke_moderation: "إلغاء التعيين كمشرف"
             backup_create: "إنشاء نسخة احتياطية"
             deleted_tag: "حذف الوسم"
+            deleted_unused_tags: "حذف الوسوم غير المستخدمة"
             renamed_tag: "إعادة تسمية الوسم"
             revoke_email: "إلغاء البريد الإلكتروني"
             lock_trust_level: "قفل مستوى الثقة"
@@ -4259,6 +4934,53 @@ ar:
             backup_download: "تنزيل النسخة الاحتياطية"
             backup_destroy: "مسح النسخة الاحتياطية"
             reviewed_post: "مراجعة المنشور"
+            custom_staff: "إجراء مخصَّص للمكوِّن الإضافي"
+            post_locked: "قفل المنشور"
+            post_edit: "تعديل المنشور"
+            post_unlocked: "إلغاء قفل المنشور"
+            check_personal_message: "الاطِّلاع على الرسالة الخاصة"
+            disabled_second_factor: "إيقاف المصادقة الثنائية"
+            topic_published: "نشر الموضوع"
+            post_approved: "الموافقة على المنشور"
+            post_rejected: "رفض المنشور"
+            create_badge: "إنشاء شارة"
+            change_badge: "تغيير الشارة"
+            delete_badge: "حذف الشارة"
+            merge_user: "دمج المستخدم"
+            entity_export: "تصدير الكيان"
+            change_name: "تغيير الاسم"
+            topic_timestamps_changed: "تغيير الطوابع الزمنية للموضوع"
+            approve_user: "اعتماد المستخدم"
+            web_hook_create: "إنشاء خطاف ويب"
+            web_hook_update: "تحديث خطاف الويب"
+            web_hook_destroy: "مسح خطاف الويب"
+            web_hook_deactivate: "إلغاء تنشيط خطاف الويب"
+            embeddable_host_create: "إنشاء مضيف قابل للتضمين"
+            embeddable_host_update: "تحديث مضيف قابل للتضمين"
+            embeddable_host_destroy: "مسح المضيف القابل للتضمين"
+            change_theme_setting: "تغيير إعدادات السمة"
+            disable_theme_component: "إيقاف مكوِّن السمة"
+            enable_theme_component: "تفعيل مكوِّن السمة"
+            revoke_title: "إزالة العنوان"
+            change_title: "تغيير العنوان"
+            api_key_create: "إنشاء مفتاح API"
+            api_key_update: "تحديث مفتاح API"
+            api_key_destroy: "مسح مفتاح API"
+            override_upload_secure_status: "تجاوز الحالة الآمنة للتحميل"
+            page_published: "نشر الصفحة"
+            page_unpublished: "إلغاء نشر الصفحة"
+            add_email: "إضافة بريد إلكتروني"
+            update_email: "تحديث البريد الإلكتروني"
+            destroy_email: "مسح البريد الإلكتروني"
+            topic_closed: "إغلاق الموضوع"
+            topic_opened: "فتح الموضوع"
+            topic_archived: "أرشفة الموضوع"
+            topic_unarchived: "إلغاء أرشفة الموضوع"
+            post_staff_note_create: "إضافة ملاحظة من فريق العمل"
+            post_staff_note_destroy: "مسح ملاحظة فريق العمل"
+            delete_group: "حذف المجموعة"
+            watched_word_create: "إضافة كلمة للمراقبة"
+            watched_word_destroy: "حذف الكلمة المُراقَبة"
         screened_emails:
           title: "عناوين البريد الإلكتروني الخاضعة للمراقبة"
           description: "عندما يحاول شخص ما إنشاء حساب جديد، سيتم التحقُّق من عناوين البريد الإلكتروني التالية وحظر التسجيل، أو اتخاذ إجراء آخر."
@@ -4272,6 +4994,7 @@ ar:
           domain: "النطاق"
         screened_ips:
           title: "عناوين IP الخاضعة للمراقبة"
+          description: 'عناوين IP التي تتم مراقبتها. استخدم "السماح" للسماح بقائمة عناوين IP.'
           delete_confirm: "هل تريد بالتأكيد إزالة القاعدة للعنوان \"%{ip_address}\"؟"
           roll_up_confirm: "هل تريد بالتأكيد تجميع عناوين IP الخاضعة للمراقبة بشكلٍ عام في الشبكات الفرعية؟"
           rolled_up_some_subnets: "تم تجميع إدخالات حظر عناوين IP بنجاح في هذه الشبكات الفرعية: %{subnets}."
@@ -4289,38 +5012,71 @@ ar:
             text: "تجميع"
             title: "يُنشئ إدخالات حظر جديدة في الشبكة الفرعية إذا كان هناك 'min_ban_entries_for_roll_up' من الإدخالات على الأقل."
         search_logs:
+          title: "البحث في السجلات"
+          term: "المصطلح"
+          searches: "عمليات البحث"
+          click_through_rate: "نسبة النقر إلى الظهور"
           types:
             all_search_types: "جميع أنواع البحث"
             header: "الرأس"
             full_page: "صفحة كاملة"
+            click_through_only: "الكل (النقر إلى الظهور فقط)"
+          header_search_results: "نتائج البحث عن العنوان"
         logster:
           title: "سجلات الأخطاء"
       watched_words:
         title: "الكلمات المُراقَبة"
         search: "بحث"
         clear_filter: "مسح"
+        show_words:
+          zero: "إظهار %{count} كلمة"
+          one: "إظهار كلمة واحدة (%{count})"
+          two: "إظهار كلمتَين (%{count})"
+          few: "إظهار %{count} كلمات"
+          many: "إظهار %{count} كلمة"
+          other: "إظهار %{count} كلمة"
         download: تنزيل
         clear_all: مسح الكل
+        clear_all_confirm: "هل تريد بالتأكيد مسح جميع الكلمات المُراقَبة للإجراء %{action}؟"
+        invalid_regex: 'الكلمة المُراقَبة "%{word}" هي تعبير عادي غير صالح.'
+        regex_warning: '<a href="%{basePath}/admin/site_settings/category/all_results?filter=watched%20words%20regular%20expressions%20">الكلمات المُراقَبة هي تعبيرات عادية</a> ولا تتضمَّن حدود الكلمات تلقائيًا. إذا كنت تريد أن يتطابق التعبير العادي مع الكلمات الكاملة، فضع <code>\b</code> في بداية التعبير العادي ونهايته.'
         actions:
           block: "حظر"
           censor: "حجب"
           require_approval: "طلب الموافقة"
           flag: "إبلاغ"
           replace: "استبدال"
+          tag: "الوسم"
           silence: "كتم"
           link: "رابط"
         action_descriptions:
+          block: "منع المنشورات التي تتضمَّن هذه الكلمات من النشر. سيرى المستخدم رسالة خطأ عندما يحاول إرسال منشوره."
+          censor: "السماح بالمنشورات التي تتضمَّن هذه الكلمات بعد استبدالها بأحرف تخفي الكلمات الخاضعة للرقابة"
           require_approval: "ستتطلب المنشورات التي تتضمَّن هذه الكلمات موافقة فريق العمل قبل أن تصبح رؤيتها ممكنة."
           flag: "اسمح بالمنشورات التي تتضمَّن هذه الكلمات، ولكن أبلغ عنها كغير لائقة حتى يتمكن المشرفون من مراجعتها."
+          replace: "استبدال الكلمات في المنشورات بكلمات أخرى"
+          tag: "وضع وسوم على الموضوعات تلقائيًا بناءً على أول منشور"
+          silence: "ستتطلب المنشورات الأولى للمستخدمين والتي تتضمَّن هذه الكلمات موافقة فريق العمل قبل رؤيتها وسيتم كتم المستخدم تلقائيًا."
+          link: "استبدال الكلمات في المنشورات بروابط"
         form:
+          label: "تتضمَّن كلمة أو عبارة"
+          placeholder: "إدخال الكلمة أو العبارة (الرمز * هو حرف بدل)"
           placeholder_regexp: "تعبير عادي"
+          replace_label: "استبدال"
+          replace_placeholder: "مثال"
+          tag_label: "الوسم"
           link_label: "رابط"
           link_placeholder: "https://example.com"
           add: "إضافة"
           success: "تم بنجاح"
+          exists: "موجودة بالفعل"
+          upload: "الإضافة من ملف"
           upload_successful: "تم التحميل بنجاح. وتمت إضافة الكلمات."
         test:
           button_label: "اختبار"
+          modal_title: "%{action}: اختبار الكلمات المُراقَبة"
+          description: "إدخال النص أدناه للتحقُّق من التطابقات مع الكلمات المُراقَبة"
+          found_matches: "التطابقات التي تم العثور عليها:"
           no_matches: "لم يتم العثور على مطابقات"
       impersonate:
         title: "الانتحال"
@@ -4333,12 +5089,15 @@ ar:
         last_emailed: "تاريخ آخر رسالة إلكترونية"
         not_found: "عذرًا، اسم المستخدم غير موجود في نظامنا."
         id_not_found: "عذرًا، معرِّف المستخدم غير موجود في نظامنا."
+        active: "نشط"
         show_emails: "إظهار عناوين البريد الإلكتروني"
+        hide_emails: "إخفاء عناوين البريد الإلكتروني"
         nav:
           new: "جديد"
           active: "نشط"
           staff: "فريق العمل"
           suspended: "المعلَّقون"
+          silenced: "مكتوم"
           staged: "مؤقت"
         approved: "تمت الموافقة عليه؟"
         titles:
@@ -4353,12 +5112,15 @@ ar:
           staff: "فريق العمل"
           admins: "المستخدمون المسؤولون"
           moderators: "المشرفون"
+          silenced: "المستخدمون المكتومون"
           suspended: "المستخدمون المعلَّقون"
+          staged: "المستخدمون المؤقتون"
         not_verified: "لم يتم التحقُّق منهم"
         check_email:
           title: "الكشف عن عنوان البريد الإلكتروني لهذا المستخدم"
           text: "إظهار"
         check_sso:
+          title: "كشف حمولة SSO"
           text: "إظهار"
       user:
         suspend_failed: "حدث خطأ في أثناء تعليق هذا المستخدم %{error}"
@@ -4368,12 +5130,24 @@ ar:
         suspend_reason_hidden_label: "ما سبب التعليق؟ سيظهر هذا النص للمستخدم عند محاولته تسجيل الدخول. احرص على أن يكون موجزًا."
         suspend_reason: "السبب"
         suspend_reason_title: "سبب التعليق"
+        suspend_reasons:
+          not_listening_to_staff: "لا يستمع إلى ملاحظات فريق العمل"
+          consuming_staff_time: "استنزف قدرًا كبيرًا من وقت فريق العمل"
+          combative: "عدائي جدًا"
+          in_wrong_place: "في المكان الخطأ"
+          no_constructive_purpose: "لا يوجد غرض بنَّاء لأفعاله بخلاف خلق المعارضة داخل المجتمع"
+          custom: "مخصَّص..."
         suspend_message: "رسالة إلكترونية"
         suspend_message_placeholder: "قدِّم المزيد من المعلومات عن التعليق بشكلٍ اختياري وسيتم إرسالها عبر البريد الالكتروني إلى المستخدم."
         suspended_by: "تم التعليق بواسطة"
         silence_reason: "السبب"
+        silenced_by: "كتمه"
         silence_modal_title: "كتم المستخدم"
+        silence_duration: "إلى متى سيتم كتم المستخدم؟"
+        silence_reason_label: "لماذا تكتم هذا المستخدم؟"
+        silence_reason_placeholder: "سبب الكتم"
         silence_message: "رسالة إلكترونية"
+        silence_message_placeholder: "(اتركه فارغا لإرسال الرسالة الافتراضية)"
         suspended_until: "(حتى %{until})"
         cant_suspend: "لا يمكن تعليق هذا المستخدم."
         delete_all_posts: "حذف جميع المنشورات"
@@ -4381,8 +5155,16 @@ ar:
         delete_posts_failed: "حدثت مشكلة في أثناء حذف المنشورات."
         penalty_post_actions: "ما الذي ترغب في فعله بالمنشور ذي الصلة؟"
         penalty_post_delete: "حذف المنشور"
+        penalty_post_delete_replies: "حذف المنشور + أي ردود"
         penalty_post_edit: "تعديل المنشور"
+        penalty_post_none: "عدم اتخاذ أي إجراء"
+        penalty_count: "عدد العقوبات"
+        clear_penalty_history:
+          title: "مسح سجل العقوبات"
+          description: "لا يمكن للمستخدمين الذين حصلوا على عقوبات الوصول إلى مستوى الثقة 3"
+        delete_all_posts_confirm_MF: "أنت على وشك حذف {POSTS, plural, zero {# منشور} one {منشور واحد (#)} two {منشوران (#)} few {# منشورات} many {# منشورًا} other {# منشور}} و{TOPICS, plural, zero {# موضوع} one {موضوع واحد (#)} two {موضوعان (#)} few {# موضوعات} many {# موضوعًا} other {# موضوع}}. هل أنت متأكد؟"
         silence: "كتم"
+        unsilence: "إلغاء الكتم"
         silenced: "تم كتمه؟"
         moderator: "مشرف؟"
         admin: "مسؤول؟"
@@ -4402,6 +5184,9 @@ ar:
         grant_moderation: "التعيين كمشرف"
         unsuspend: "إلغاء التعليق"
         suspend: "تعليق"
+        show_flags_received: "عرض البلاغات المقدَّمة"
+        flags_received_by: "البلاغات المقدَّمة ضد %{username}"
+        flags_received_none: "لم يتم تقديم أي بلاغات ضد هذا المستخدم."
         reputation: الشهرة
         permissions: الأذونات
         activity: النشاط
@@ -4415,6 +5200,8 @@ ar:
         flags_given_count: بلاغ مقدَّم
         flags_received_count: بلاغ مُستلَم
         warnings_received_count: تحذير مُستلَم
+        warnings_list_warning: |
+          بصفتك مشرفًا، قد لا تتمكن من عرض كل هذه الموضوعات. إذا لزم الأمر، اطلب من المسؤول أو المشرف المُصدِر للأذونات منح المشرفين <b>moderators</b> إذن الوصول إلى الرسالة.
         flags_given_received_count: "بلاغ مقدَّم/مُستلَم"
         approve: "الموافقة"
         approved_by: "تمت الموافقة بواسطة"
@@ -4426,12 +5213,34 @@ ar:
         anonymize_yes: "نعم، إخفاء هوية هذا الحساب"
         anonymize_failed: "حدثت مشكلة في أثناء إخفاء هوية الحساب."
         delete: "حذف المستخدم"
+        delete_posts:
+          progress:
+            title: "تقدُّم حذف المنشورات"
         merge:
+          button: "دمج"
           prompt:
+            title: "نقل @%{username} وحذفه"
+            description: |
+              <p>يُرجى اختيار مالك جديد لمحتوى <b>@%{username}</b>.</p>
+
+              <p>سيتم نقل جميع الموضوعات والمنشورات والرسائل والمحتويات الأخرى التي تم إنشاؤها بواسطة <b>@%{username}</b>.</p>
             target_username_placeholder: "اسم المستخدم للمالك الجديد"
+            transfer_and_delete: "نقل @%{username} وحذفه"
             cancel: "إلغاء"
+          progress:
+            title: "تقدُّم الدمج"
           confirmation:
+            title: "نقل @%{username} وحذفه"
+            description: |
+              <p>سيتم نقل جميع محتويات <b>@%{username}</b> وإسنادها إلى <b>@%{targetUsername}</b>. بعد نقل المحتوى، سيتم حذف حساب <b>@%{username}</b>.</p>
+
+              <p><b>لا يمكن التراجع عن هذا الإجراء!</b></p>
+
+              <p>للمتابعة، اكتب: <code>%{text}</code></p>
+            text: "نقل @%{username} إلى @%{targetUsername}"
+            transfer_and_delete: "نقل @%{username} وحذفه"
             cancel: "إلغاء"
+        merging_user: "جارٍ دمج المستخدم..."
         merge_failed: "حدث خطأ في أثناء دمج المستخدمين."
         delete_forbidden_because_staff: "لا يمكن حذف المسؤولين والمشرفين."
         delete_posts_forbidden_because_staff: "لا يمكن حذف جميع منشورات المسؤولين والمشرفين."
@@ -4456,6 +5265,7 @@ ar:
           few: "يتعذَّر حذف جميع المنشورات لأن المستخدم لديه أكثر من %{count} منشورات. (delete_all_posts_max)"
           many: "يتعذَّر حذف جميع المنشورات لأن المستخدم لديه أكثر من %{count} منشورًا. (delete_all_posts_max)"
           other: "يتعذَّر حذف جميع المنشورات لأن المستخدم لديه أكثر من %{count} منشور. (delete_all_posts_max)"
+        delete_confirm: "يُفضَّل عامةً إخفاء هوية المستخدمين بدلًا من حذفهم لتجنُّب إزالة المحتوى من المناقشات الحالية.<br><br>هل تريد بالتأكيد حذف هذا المستخدم؟ هذا الإجراء دائم!"
         delete_and_block: "حذف هذا البريد الإلكتروني وعنوان IP و<b>حظرهما</b>"
         delete_dont_block: "الحذف فقط"
         deleting_user: "جارٍ حذف المستخدم..."
@@ -4487,6 +5297,7 @@ ar:
           threshold_reached: "تم استلام عدد كبير جدًا من الرسائل المرتدة من هذا البريد الإلكتروني."
         trust_level_change_failed: "حدثت مشكلة في أثناء تغيير مستوى ثقة المستخدم."
         suspend_modal_title: "تعليق المستخدم"
+        confirm_cancel_penalty: "هل تريد بالتأكيد تجاهل العقوبة؟"
         trust_level_2_users: "المستخدمون من مستوى الثقة 2."
         trust_level_3_requirements: "متطلبات مستوى الثقة 3"
         trust_level_locked_tip: "مستوى الثقة مقفل، لن يرقِّي النظام المستخدم أو يخفض رتبته"
@@ -4517,6 +5328,8 @@ ar:
           likes_received: "الإعجابات المتلقاة"
           likes_received_days: "الإعجابات المتلقاة: الأيام المميزة"
           likes_received_users: "الإعجابات المتلقاة: الأعضاء المميزون"
+          suspended: "معلَّق (آخر 6 أشهر)"
+          silenced: "مكتوم (آخر 6 أشهر)"
           qualifies: "مؤهل لمستوى الثقة 3."
           does_not_qualify: "غير مؤهل لمستوى الثقة 3."
           will_be_promoted: "ستتم ترقيته قريبًا."
@@ -4525,11 +5338,15 @@ ar:
           locked_will_not_be_promoted: "مستوى الثقة مقفل. لن يتم ترقيته أبدًا."
           locked_will_not_be_demoted: "مستوى الثقة مقفل. لن يتم خفض رتبته أبدًا."
         discourse_connect:
+          title: "تسجيل الدخول الموحَّد من خلال DiscourseConnect"
           external_id: "المعرِّف الخارجي"
           external_username: "اسم المستخدم"
           external_name: "الاسم"
           external_email: "البريد الإلكتروني"
           external_avatar_url: "عنوان URL لصورة الملف الشخصي"
+          last_payload: "آخر حمولة"
+          delete_sso_record: "حذف سجل SSO"
+          confirm_delete: "هل تريد بالتأكيد حذف سجل DiscourseConnect هذا؟"
       user_fields:
         title: "حقول المستخدم"
         help: "إضافة حقول يمكن لمستخدميك ملئها."
@@ -4560,10 +5377,15 @@ ar:
           title: "العرض على بطاقة المستخدم؟"
           enabled: "العرض على بطاقة المستخدم"
           disabled: "غير معروض على بطاقة المستخدم"
+        searchable:
+          title: "قابل للبحث؟"
+          enabled: "قابل للبحث"
+          disabled: "غير قابل للبحث"
         field_types:
           text: "حقل نصي"
           confirm: "تأكيد"
           dropdown: "قائمة منسدلة"
+          multiselect: "حقل اختيارات متعددة"
       site_text:
         description: "يمكنك تخصيص أي من النصوص في منتداك. يُرجى البدء بالبحث أدناه:"
         search: "البحث عن النص الذي تريد تعديله"
@@ -4574,23 +5396,38 @@ ar:
         go_back: "العودة إلى البحث"
         recommended: "نوصيك بتخصيص النص التالي ليلائم احتياجاتك:"
         show_overriden: "إظهار التجاوزات فقط"
+        locale: "اللغة:"
+        fallback_locale_warning: "أنت تجري تعديلًا على لغة بناءً على %{fallback}. لن يتمكن المستخدمون الذين اختاروا%{fallback} كلغة لواجهتهم من رؤية تغييراتك."
+        more_than_50_results: "هناك أكثر من 50 نتيجة. يُرجى تحسين البحث."
       settings:
         show_overriden: "إظهار التجاوزات فقط"
+        history: "عرض سجل التغييرات"
         reset: "إعادة الضبط"
         none: "لا يوجد"
       site_settings:
+        emoji_list:
+          invalid_input: "يجب أن تحتوي قائمة الرموز التعبيرية على أسماء صالحة للرموز التعبيرية فقط، مثل: العناق"
+          add_emoji_button:
+            label: "إضافة رمز تعبيري"
         title: "الإعدادات"
         no_results: "لم يتم العثور على نتائج."
+        more_than_30_results: "هناك أكثر من 30 نتيجة. يُرجى تحسين البحث أو تحديد فئة."
         clear_filter: "مسح"
         add_url: "إضافة عنوان URL"
         add_host: "إضافة مضيف"
+        add_group: "إضافة مجموعة"
         uploaded_image_list:
+          label: "تعديل القائمة"
+          empty: "لا توجد صور حتى الآن. يُرجى تحميل واحدة."
           upload:
             label: "التحميل"
             title: "تحميل الصور"
+        selectable_avatars:
+          title: "قائمة الصور الرمزية التي يمكن للمستخدمين الاختيار منها"
         categories:
           all_results: "الكل"
           required: "مطلوب"
+          branding: "العلامة التجارية"
           basic: "الإعداد الأساسي"
           users: "المستخدمون"
           posting: "النشر"
@@ -4616,8 +5453,17 @@ ar:
           search: "البحث"
           groups: "المجموعات"
           dashboard: "لوحة المعلومات"
+        secret_list:
+          invalid_input: "لا يمكن ترك حقول الإدخال فارغة أو أن تتضمَّن شريطًا عموديًا."
         default_categories:
+          modal_description: "هل ترغب في تطبيق هذا التغيير بأثر رجعي؟ سيؤدي ذلك إلى تغيير التفضيلات لعدد %{count} مستخدم حالي."
           modal_yes: "نعم"
+          modal_no: "لا، تطبيق التغيير من الآن فصاعدًا فقط"
+        simple_list:
+          add_item: "إضافة عنصر..."
+        json_schema:
+          edit: تشغيل المحرِّر
+          modal_title: "تعديل %{name}"
       badges:
         title: الشارات
         new_badge: شارة جديدة
@@ -4654,10 +5500,16 @@ ar:
         enabled: فعّل الشارة
         icon: الأيقونة
         image: الصورة
+        graphic: رمز الشارة
         icon_help: "إدخال اسم أيقونة Font Awesome (استخدم البادئة \"far-\" للأيقونات العادية والبادئة \"fab-‎\" لأيقونات العلامات التجارية)"
+        image_help: "يؤدي تحميل صورة إلى تجاوز حقل الرمز إذا تم ضبط كليهما."
+        select_an_icon: "تحديد رمز"
+        upload_an_image: "تحميل صورة"
+        read_only_setting_help: "تخصيص النص"
         query: استعلام الشارة (SQL)
         target_posts: استهداف الاستعلام للمنشورات
         auto_revoke: تشغيل استفسار الإلغاء يوميًا
+        show_posts: عرض المنشور الذي منح الشارة في صفحة الشارة
         trigger: المشغِّل
         trigger_type:
           none: "التحديث يوميًا"
@@ -4690,10 +5542,15 @@ ar:
             with_post_time: '‏<span class="username">%{username}</span> للمنشور في %{link} في <span class="time">%{time}</span>'
             with_time: '‏<span class="username">%{username}</span> في <span class="time">%{time}</span>'
         badge_intro:
+          title: "حدِّد شارة موجودة أو أنشئ شارة جديدة للبدء"
+          emoji: "الرمز التعبيري لطالبة"
           what_are_badges_title: "ما الشارات؟"
           badge_query_examples_title: "أمثلة على استعلامات الشارات"
         mass_award:
+          title: جائزة جماعية
+          description: منح الشارة نفسها للعديد من المستخدمين دفعة واحدة
           no_badge_selected: يُرجى تحديد شارة للبدء.
+          perform: "منح شارة للمستخدمين"
           upload_csv: تحميل ملف CSV يتضمَّن عناوين البريد الإلكتروني للمستخدمين أو أسماء المستخدمين
           aborted: يُرجى تحميل ملف CSV يتضمَّن عناوين البريد الإلكتروني للمستخدمين أو أسماء المستخدمين
           replace_owners: إزالة الشارة من مالكيها السابقين
@@ -4705,6 +5562,7 @@ ar:
         name: "الاسم"
         group: "المجموعة"
         image: "الصورة"
+        alt: "معاينة الرمز التعبيري المخصَّص"
         delete_confirm: "هل تريد بالتأكيد حذف الرمز التعبيري :%{name}:؟"
       embedding:
         get_started: "إذا كنت تريد تضمين Discourse في موقع آخر، فابدأ بإضافة مضيفه."
@@ -4713,6 +5571,7 @@ ar:
         title: "التضمين"
         host: "المضيفون المسموح بهم"
         class_name: "اسم الفئة"
+        allowed_paths: "قائمة السماح بالمسارات"
         edit: "تعديل"
         category: "النشر في الفئة"
         add_host: "إضافة مضيف"
@@ -4721,13 +5580,16 @@ ar:
         crawling_description: "عندما يُنشئ Discourse موضوعات لمنشوراتك، إذا لم يتوفَّر موجز RSS/ATOM، فسيحاول تحليل محتواك من HTML. قد يكون من الصعب أحيانًا استخراج محتواك؛ لذا فإننا نمنحك القدرة على تحديد قواعد CSS لجعل الاستخراج أسهل."
         embed_by_username: "اسم المستخدم لإنشاء الموضوع"
         embed_post_limit: "أقصى عدد من المنشورات يمكن تضمينه"
+        embed_title_scrubber: "التعبير العادي المُستخدَم لتنقيح عناوين المنشورات"
         embed_truncate: "اقتطاع المنشورات المضمَّنة"
+        embed_unlisted: "سيتم إلغاء إدراج الموضوعات المستوردة حتى يتم الرد."
         allowed_embed_selectors: "محدِّد CSS للعناصر المسموح بها في التضمينات"
         blocked_embed_selectors: "محدِّد CSS للعناصر التي تتم إزالتها من التضمينات"
         allowed_embed_classnames: "أسماء فئات CSS المسموح بها"
         save: "حفظ إعدادات التضمين"
       permalink:
         title: "الروابط الثابتة"
+        description: "عمليات إعادة التوجيه التي سيتم تطبيقها على عناوين URL التي لا يعرفها المنتدى."
         url: "عنوان URL"
         topic_id: "معرِّف الموضوع"
         topic_title: "الموضوع"
@@ -4736,7 +5598,9 @@ ar:
         category_id: "معرِّف الفئة"
         category_title: "الفئة"
         tag_name: "اسم الوسم"
+        external_url: "عنوان URL خارجي أو نسبي"
         destination: "الوجهة"
+        copy_to_clipboard: "نسخ الرابط الثابت إلى الحافظة"
         delete_confirm: هل تريد بالتأكيد حذف هذا الرابط الثابت؟
         form:
           label: "جديد:"
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index 34fa7197bc..6562b847eb 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -265,10 +265,13 @@ da:
       contact_info: "I tilfælde af en kritisk begivenhed eller vigtige spørgsmål angående denne side, kontakt os venligst på %{contact_info}."
     bookmarked:
       title: "Bogmærke"
+      edit_bookmark: "Rediger Bogmærke"
       clear_bookmarks: "Fjern bogmærker"
       help:
         bookmark: "Klik for at sætte et bogmærke i det første indlæg i denne tråd"
+        edit_bookmark: "Klik for at redigere bogmærket for dette emne"
         unbookmark: "Klik for at fjerne alle bogmærker i dette emne"
+        unbookmark_with_reminder: "Klik for at fjerne alle bogmærker og påmindelser i dette emne."
     bookmarks:
       created: "Du har sat et bogmærke for dette indlæg. %{name}"
       not_bookmarked: "bogmærk dette indlæg"
@@ -1503,8 +1506,11 @@ da:
       title:
         title: "Titel"
         none: "(ingen)"
+        instructions: "vises efter dit brugernavn"
       flair:
+        title: "Flair"
         none: "(ingen)"
+        instructions: "ikon vises ved siden af dit profilbillede"
       primary_group:
         title: "Primær Gruppe"
         none: "(ingen)"
@@ -2033,6 +2039,7 @@ da:
         votes_released: "Afstemningen blev frigivet"
     upload_selector:
       uploading: "Overfører billede"
+      processing: "Behandler Overførsel"
       select_file: "Vælg fil"
       default_image_alt_text: billede
     search:
@@ -2909,6 +2916,7 @@ da:
       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"
       num_auto_bump_daily: "Antal åbne emner, der automatisk 'bump'es dagligt:"
       navigate_to_first_post_after_read: "Navigér til det første indlæg, når emnerne er læst"
@@ -3419,6 +3427,8 @@ da:
         regular: "Trofast"
         leader: "Veteran"
       detailed_name: "%{level}: %{name}"
+    pick_files_button:
+      unsupported_file_picked: "Du har valgt en fil, der ikke understøttes. Understøttede filtyper - %{types}."
   admin_js:
     type_to_filter: "skriv for at filtrere…"
     admin:
@@ -3646,6 +3656,7 @@ da:
               log_out: Log alle sessioner ud for en bruger.
               anonymize: Anonymiser brugerkonti.
               delete: Slet brugerkonti.
+              list: Hent en liste over brugere.
             email:
               receive_emails: Kombiner dette anvendelsesområde med mail-modtageren til at behandle indgående e-mails.
       web_hooks:
@@ -3860,6 +3871,7 @@ da:
           theme: "Tema"
           component: "Komponent"
           components: "komponenter"
+          filter_placeholder: "skriv for at filtrere…"
           theme_name: "Tema navn"
           component_name: "Komponent navn"
           themes_intro: "Vælg et eksisterende tema, eller installer et nyt for at komme i gang"
@@ -4462,6 +4474,7 @@ da:
         penalty_post_edit: "Rediger indlægget"
         penalty_post_none: "Gøre ingenting"
         penalty_count: "Straffetælling"
+        penalty_history: "Straf Historik"
         clear_penalty_history:
           title: "Ryd straffehistorie"
           description: "brugere med straffe kan ikke nå TL3"
@@ -4595,6 +4608,7 @@ da:
         unlock_trust_level: "Lås tillidsniveau op"
         silenced_count: "Mådeholdt (silenced)"
         suspended_count: "Suspenderet"
+        last_six_months: "Seneste 6 måneder"
         tl3_requirements:
           title: "Krav for fortrolighedsniveau 3"
           table_title:
@@ -4672,6 +4686,7 @@ da:
           text: "Tekstfelt"
           confirm: "Bekræft"
           dropdown: "Rulleboks"
+          multiselect: "Multivælg"
       site_text:
         description: "Du kan ændre alt tekst på dette forum. Start med at søge herunder:"
         search: "Søg efter teksten du gerne vil rette"
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index aac208c4a0..1e524465d1 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -22,7 +22,7 @@ fr:
             mb: Mo
             tb: To
       short:
-        thousands: "%{number} 000"
+        thousands: "%{number} k"
         millions: "%{number} M"
     dates:
       time: "HH:mm"
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index ef6986f415..b64b11f1b8 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -3189,6 +3189,7 @@ he:
       position_disabled: "קטגוריות יוצגו על פס סדר הפעילות. כדי לשלוט בסדר הקטגורייות ברשימה,"
       position_disabled_click: 'אפשרו את ההגדרה "סדר קטגוריות קבוע".'
       minimum_required_tags: "מספר התגיות המזערי הנדרש לנושא:"
+      default_slow_mode: 'להפעיל „מצב אטי” לנושאים חדשים בקטגוריה הזאת.'
       parent: "קטגורית אם"
       num_auto_bump_daily: "מספר הנושאים הפתוחים להקפצה מדי יום:"
       navigate_to_first_post_after_read: "ניווט לפוסט הראשוני לאחר שהנושאים נקראו"
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index 035f0f4468..e4aa40a50c 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -62,7 +62,7 @@ ja:
         over_x_years:
           other: "%{count} 年以上"
         almost_x_years:
-          other: "約 %{count} 年"
+          other: "%{count} 年"
         date_month: "MMM D 日"
         date_year: "'YY 年 MMM"
       medium:
@@ -126,7 +126,7 @@ ja:
         disabled: "固定解除しました: %{when}"
       pinned_globally:
         enabled: "全体に固定しました: %{when}"
-        disabled: "全体に固定解除しました: %{when}"
+        disabled: "固定解除しました: %{when}"
       visible:
         enabled: "表示: %{when}"
         disabled: "非表示: %{when}"
@@ -178,7 +178,7 @@ ja:
     submit: "送信"
     generic_error: "申し訳ありません。エラーが発生しました。"
     generic_error_with_reason: "エラーが発生しました: %{error}"
-    sign_up: "アカウントを作成"
+    sign_up: "アカウントを登録"
     log_in: "ログイン"
     age: "年齢"
     joined: "参加"
@@ -257,7 +257,7 @@ ja:
       confirm_clear: "このトピックのすべてのブックマークをクリアしてもよろしいですか?"
       save: "保存"
       no_timezone: 'まだタイムゾーンを設定していないためリマインダーを設定することはできません。<a href="%{basePath}/my/preferences/profile">プロフィール</a>で設定してください。'
-      invalid_custom_datetime: "入力された日時が無効です。もう一度やり直してください。"
+      invalid_custom_datetime: "入力された日時が無効です。もう一度お試しください。"
       list_permission_denied: "このユーザーのブックマークを表示する権限がありません。"
       no_user_bookmarks: "ブックマークした投稿はありません。ブックマークを使用すると、特定の投稿を素早く参照できます。"
       auto_delete_preference:
@@ -307,7 +307,7 @@ ja:
     enable: "有効化"
     disable: "無効化"
     continue: "続行"
-    undo: "取り消す"
+    undo: "元に戻す"
     revert: "戻す"
     failed: "失敗しました"
     switch_to_anon: "匿名モードを開始"
@@ -372,7 +372,7 @@ ja:
       view_all: "すべて表示"
       grouped_by_topic: "トピック別"
       none: "レビューする項目がありません"
-      view_pending: "保留を表示"
+      view_pending: "保留中を表示"
       topic_has_pending:
         other: "このトピックには承認待ちの投稿が <b>%{count}</b> 件あります"
       title: "レビュー"
@@ -399,10 +399,10 @@ ja:
         disagreed:
           other: "同意しない %{count}%"
         ignored:
-          other: "無投票 %{count}%"
+          other: "無視 %{count}%"
       topics:
         topic: "トピック"
-        reviewable_count: "カウント"
+        reviewable_count: "件数"
         reported_by: "報告者:"
         deleted: "[削除されたトピック]"
         original: "(元のトピック)"
@@ -453,7 +453,7 @@ ja:
         rejected:
           title: "却下"
         ignored:
-          title: "無投票"
+          title: "無視"
         deleted:
           title: "削除済み"
         reviewed:
@@ -528,8 +528,8 @@ ja:
       username: "ユーザー名"
       filter_name: "ユーザー名でフィルタ"
       title: "ユーザー"
-      likes_given: "した"
-      likes_received: "された"
+      likes_given: "与えた"
+      likes_received: "受け取った"
       topics_entered: "閲覧数"
       topics_entered_long: "閲覧したトピック数"
       time_read: "読んだ時間"
@@ -726,22 +726,22 @@ ja:
         make_owner_description: "<b>%{username}</b> をこのグループのオーナーにする"
         remove_owner: "オーナーから削除"
         remove_owner_description: "<b>%{username}</b> をこのグループのオーナーから削除する"
-        make_primary: "プライマリにする"
-        make_primary_description: "これを <b>%{username}</b> のプライマリグループにする"
-        remove_primary: "プライマリとして削除"
-        remove_primary_description: "これを <b>%{username}</b> のプライマリグループとして削除する"
+        make_primary: "プライマリーにする"
+        make_primary_description: "これを <b>%{username}</b> のプライマリーグループにします"
+        remove_primary: "プライマリーとして削除"
+        remove_primary_description: "これを <b>%{username}</b> のプライマリーグループとして削除します"
         remove_members: "メンバーを削除"
         remove_members_description: "選択したユーザーをこのグループから削除する"
         make_owners: "オーナーにする"
         make_owners_description: "選択したユーザーをこのグループのオーナーにする"
         remove_owners: "オーナーを削除"
         remove_owners_description: "このグループのオーナーとして、選択したユーザーを削除する"
-        make_all_primary: "すべてをプライマリにする"
-        make_all_primary_description: "これを選択したすべてのユーザーのプライマリグループにする"
-        remove_all_primary: "プライマリとして削除"
-        remove_all_primary_description: "このグループをプライマリとして削除する"
+        make_all_primary: "すべてをプライマリーにする"
+        make_all_primary_description: "これを選択したすべてのユーザーのプライマリーグループにします"
+        remove_all_primary: "プライマリーとして削除"
+        remove_all_primary_description: "このグループをプライマリーとして削除します"
         owner: "オーナー"
-        primary: "プライマリ"
+        primary: "プライマリー"
         forbidden: "メンバーの表示は許可されていません。"
       topics: "トピック"
       posts: "投稿"
@@ -763,13 +763,13 @@ ja:
           description: "すべてのメッセージの新規投稿について通知があり、新しい返信の件数が表示されます。"
         watching_first_post:
           title: "最初の投稿をウォッチ中"
-          description: "このグループの新着メッセージは通知されますが、メッセージへの返信は通知されません。"
+          description: "このグループの新規メッセージは通知されますが、メッセージへの返信は通知されません。"
         tracking:
           title: "追跡中"
           description: "誰かが @ユーザー名であなたをメンションするか返信すると通知され、新しい返信の件数が表示されます。"
         regular:
           title: "通常"
-          description: "誰かが @ユーザー名であなたをメンションした場合やあなたに返信した場合に、通知されます。"
+          description: "誰かが @ユーザー名であなたをメンションしたり、あなたに返信したりすると通知が送信されます。"
         muted:
           title: "ミュート"
           description: "このグループのすべてのメッセージは通知されません。"
@@ -801,7 +801,7 @@ ja:
       "11": "編集"
       "12": "送信済み項目"
       "13": "受信トレイ"
-      "14": "保留"
+      "14": "保留中"
       "15": "下書き"
     categories:
       all: "すべてのカテゴリ"
@@ -837,7 +837,7 @@ ja:
     ip_lookup:
       title: IP アドレスを検索
       hostname: ホスト名
-      location: 所在地
+      location: 場所
       location_not_found: (不明)
       organisation: 組織
       phone: 電話
@@ -992,15 +992,15 @@ ja:
         individual: "新しい投稿があるたびにメールで送る"
         individual_no_echo: "自分以外の新しい投稿があるたびにメールで送る"
         many_per_day: "新しい投稿があるたびにメールを受け取る (1 日 %{dailyEmailEstimate} 回程度)"
-        few_per_day: "新しい投稿があるたびにメールを受け取る (1日 2 回程度)"
+        few_per_day: "新しい投稿があるたびにメールを受け取る (1 日 2 回程度)"
         warning: "メーリングリストモードです。メール通知設定が無効になります。"
       tag_settings: "タグ"
       watched_tags: "ウォッチ中"
       watched_tags_instructions: "これらのタグが付いたすべてのトピックを自動的にウォッチします。すべての新しい投稿とトピックが通知され、トピックの隣に新しい投稿の件数が表示されます。"
-      tracked_tags: "追跡"
+      tracked_tags: "追跡中"
       tracked_tags_instructions: "これらのタグが付いたすべてのトピックを自動的に追跡します。トピックの横に新しい投稿の件数が表示されます。"
       muted_tags: "ミュート"
-      muted_tags_instructions: "これらのカテゴリの新しいトピックについては通知されず、最新にも表示されません。"
+      muted_tags_instructions: "これらのカテゴリの新規トピックについては通知されず、最新にも表示されません。"
       watched_categories: "ウォッチ中"
       watched_categories_instructions: "これらのカテゴリ内のすべてのトピックを自動的にウォッチします。すべての新しい投稿とトピックが通知され、トピックの隣に新しい投稿の件数が表示されます。"
       tracked_categories: "追跡中"
@@ -1012,7 +1012,7 @@ ja:
       muted_categories: "ミュート"
       muted_categories_instructions: "これらのカテゴリの新しいトピックに関する通知はユーザーに送信されません。また、カテゴリや最新のページにも表示されません。"
       muted_categories_instructions_dont_hide: "これらのカテゴリの新しいトピックに関する通知は送信されません。"
-      regular_categories: "通常"
+      regular_categories: "レギュラー"
       regular_categories_instructions: "これらのカテゴリは「最新」と「人気」のトピックリストに表示されます。"
       no_category_access: "カテゴリへのアクセスはモデレーターとして制限されているため、保存できません。"
       delete_account: "アカウントを削除"
@@ -1053,7 +1053,7 @@ ja:
         sent: "送信済み"
         archive: "アーカイブ"
         groups: "自分のグループ"
-        move_to_inbox: "受信トレイへ移動"
+        move_to_inbox: "受信トレイに移動"
         move_to_archive: "アーカイブ"
         failed_to_move: "選択されたメッセージを移動できませんでした (ネットワークがダウンしている可能性があります)"
         tags: "タグ"
@@ -1087,7 +1087,7 @@ ja:
         manage:
           other: "バックアップコードを管理してください。 <strong>%{count}</strong> 個のバックアップコードが残っています。"
         copy_to_clipboard: "クリップボードにコピー"
-        copy_to_clipboard_error: "クリップボードにコピーする際にエラーが発生しました"
+        copy_to_clipboard_error: "データをクリップボードにコピーする際にエラーが発生しました"
         copied_to_clipboard: "クリップボードにコピーしました"
         download_backup_codes: "バックアップコードをダウンロードする"
         remaining_codes:
@@ -1168,7 +1168,7 @@ ja:
         letter_based: "システムプロフィール画像"
         uploaded_avatar: "カスタム画像"
         uploaded_avatar_empty: "カスタム画像を追加する"
-        upload_title: "画像をアップロードする"
+        upload_title: "写真をアップロードする"
         image_is_not_a_square: "警告: 幅と高さが等しくないため、画像をトリミングしました。"
         logo_small: "サイトの小さなロゴ。デフォルトで使用されます。"
       change_profile_background:
@@ -1182,15 +1182,15 @@ ja:
         instructions: "このトピックへのリンクは、あなたのユーザーカードとプロフィールに表示されます。"
       email:
         title: "メールアドレス"
-        primary: "プライマリメールアドレス"
+        primary: "プライマリーメールアドレス"
         secondary: "セカンダリメールアドレス"
-        primary_label: "プライマリ"
+        primary_label: "プライマリー"
         unconfirmed_label: "未確認"
         resend_label: "確認メールを再送信する"
         resending_label: "送信中..."
         resent_label: "メールを送信しました"
         update_email: "メールアドレスを変更"
-        set_primary: "プライマリメールアドレスを設定"
+        set_primary: "プライマリーメールアドレスを設定"
         destroy: "メールアドレスを削除"
         add_email: "代替メールアドレスを追加"
         auth_override_instructions: "メールアドレスは認証プロバイダーから更新できます。"
@@ -1228,7 +1228,7 @@ ja:
         instructions: "一意の短い名前、スペースの使用不可"
         short_instructions: "@%{username} であなたをメンションできます"
         available: "ユーザー名を使用できます"
-        not_available: "使用できません。%{suggestion} はいかがですか？"
+        not_available: "利用できません。%{suggestion}を試しますか？"
         not_available_no_suggestion: "使用できません"
         too_short: "ユーザー名が短すぎます"
         too_long: "ユーザー名が長すぎます"
@@ -1265,7 +1265,7 @@ ja:
       last_seen: "アクセス"
       created: "参加日"
       log_out: "ログアウト"
-      location: "所在地"
+      location: "場所"
       website: "ウェブサイト"
       email_settings: "メール"
       hide_profile_and_presence: "公開プロフィールとプレゼンス機能を非表示にする"
@@ -1274,7 +1274,7 @@ ja:
         title: "テキストサイズ"
         smallest: "最小"
         smaller: "小"
-        normal: "デフォルト"
+        normal: "標準"
         larger: "大"
         largest: "最大"
       title_count_mode:
@@ -1302,7 +1302,7 @@ ja:
         every_six_months: "6 か月毎"
       email_level:
         title: "誰かが自分の投稿を引用またはそれに返信したとき、@ユーザー名で自分をメンションしたとき、または自分をトピックに招待したときにメールでその通知を受け取る"
-        always: "常に"
+        always: "常時"
         only_when_away: "離れている時のみ"
         never: "通知しない"
       email_messages_level: "メッセージを受け取ったときにメールで通知を受け取る"
@@ -1338,7 +1338,7 @@ ja:
         expired_tab_with_count: "期限切れ (%{count})"
         redeemed_tab: "承諾済み"
         redeemed_tab_with_count: "承諾済み (%{count})"
-        invited_via: "招待状"
+        invited_via: "招待"
         invited_via_link: "リンク %{key} (%{count}/%{max} 引き換え済み)"
         groups: "グループ"
         topic: "トピック"
@@ -1358,7 +1358,7 @@ ja:
         redeemed: "承諾済みの招待"
         redeemed_at: "承諾済み"
         pending: "保留中の招待"
-        topics_entered: "閲覧したトピックの数"
+        topics_entered: "閲覧したトピック数"
         posts_read_count: "既読の投稿数"
         expired: "この招待は期限切れになりました。"
         remove_all: "期限切れの招待を削除"
@@ -1383,8 +1383,8 @@ ja:
           max_redemptions_allowed_label: "このリンクを使用して登録できるのは何人ですか？"
           expires_at: "この招待リンクはいつまで有効ですか？"
         invite:
-          new_title: "招待状の作成"
-          edit_title: "招待状の編集"
+          new_title: "招待の作成"
+          edit_title: "招待の編集"
           instructions: "このサイトへのアクセスと即時に許可するにはこのリンクを共有します"
           copy_link: "リンクをコピー"
           expires_in_time: "%{time} で期限切れ"
@@ -1398,8 +1398,8 @@ ja:
           expires_at: "有効期限"
           custom_message: "オプションの個人メッセージ"
           send_invite_email: "保存してメールを送信"
-          save_invite: "招待状を保存"
-          invite_saved: "招待状は保存されました。"
+          save_invite: "招待を保存"
+          invite_saved: "招待は保存されました。"
           invite_copied: "招待リンクがコピーされました。"
         bulk_invite:
           none: "このページに表示する招待はありません。"
@@ -1407,7 +1407,7 @@ ja:
           instructions: |
             <p>コミュニティをすばやく拡大するには、ユーザーのリストを招待します。招待するユーザーのメールアドレスごとに少なくとも 1 行を含む <a href="https://en.wikipedia.org/wiki/Comma-separated_values" target="_blank">CSV ファイル</a>を準備してください。カンマ区切りの情報は、グループに人を追加したい場合、またはそれらのユーザーが初めてサインインしたときに特定のトピックに移動させる場合に利用できます。</p>
             <pre>john@smith.com,first_group_name;second_group_name,topic_id</pre>
-            <p>アップロードされる CSV ファイルに含まれるメールアドレスに招待状が送られ、後で管理することができます。</p>
+            <p>アップロードされる CSV ファイルに含まれるメールアドレスに招待が送られ、後で管理することができます。</p>
           progress: "%{progress}% アップロード済み..."
           success: "ファイルは正常にアップロードされました。処理が完了すると、メッセージで通知されます。"
           error: "ファイルは CSV 形式である必要があります。"
@@ -1488,7 +1488,7 @@ ja:
         the_topic: "トピック"
     loading: "読み込み中..."
     errors:
-      prev_page: "読み込み中"
+      prev_page: "次の項目を読み込み中に発生しました:"
       reasons:
         network: "ネットワークエラー"
         server: "サーバーエラー"
@@ -1543,11 +1543,11 @@ ja:
     replies_lowercase:
       other: 返信
     signup_cta:
-      sign_up: "サインアップ"
+      sign_up: "アカウントを登録"
       hide_session: "明日リマインダーを通知する"
       hide_forever: "いいえ、結構です"
       hidden_for_session: "了解です。明日お尋ねします。'ログイン' からでもアカウントを作成できます。"
-      intro: "こんにちは！ ディスカッションを楽しんでいるようですね。ですが、サインアップはまだのようです。"
+      intro: "こんにちは！ ディスカッションを楽しんでいるようですね。ですが、アカウント登録はまだのようです。"
       value_prop: "アカウントを作成した後、今読んでいるページへ戻ります。また、新しい投稿があった場合はそのことをメールでお知らせします。 「いいね！」を使って気に入った投稿をみんなに教えましょう。:heartpulse:"
     summary:
       enabled_description: "このトピックの要約を閲覧しています。コミュニティが最も面白いとした投稿のまとめです。"
@@ -1621,14 +1621,14 @@ ja:
       second_factor_description: "アプリから認証コードを入力してください:"
       second_factor_backup: "バックアップ コードを使用してログインする"
       second_factor_backup_title: "二要素バックアップ"
-      second_factor_backup_description: "バックアップコードを入力してください:"
+      second_factor_backup_description: "バックアップコードの 1 つを入力してください。"
       second_factor: "認証アプリを使用してログインする"
       security_key_description: "物理的なセキュリティキーの準備ができたら、[セキュリティキーで認証] ボタンを押します。"
       security_key_alternative: "別の方法を試してください"
       security_key_authenticate: "セキュリティキーで認証"
-      security_key_not_allowed_error: "セキュリティキー認証プロセスがタイムアウトしたか、キャンセルされました。"
+      security_key_not_allowed_error: "セキュリティキーの認証プロセスがタイムアウトしたかキャンセルされました。"
       security_key_no_matching_credential_error: "提供されたセキュリティキーに一致する資格情報が見つかりませんでした。"
-      security_key_support_missing_error: "現在のデバイスまたはブラウザは、セキュリティキーの使用をサポートしていません。別の方法を使用してください。"
+      security_key_support_missing_error: "現在のデバイスまたはブラウザではセキュリティキーの使用がサポートされていません。別の方法を使用してください。"
       email_placeholder: "メール / ユーザー名"
       caps_lock_warning: "Caps Lock がオンになっています"
       error: "不明なエラー"
@@ -1648,7 +1648,7 @@ ja:
       admin_not_allowed_from_ip_address: "その IP アドレスからは管理者としてログインできません。"
       resend_activation_email: "ここをクリックすると、再度アクティベーションメールを送信します。"
       omniauth_disallow_totp: "あなたのアカウントは二要素認証が有効になっています。ログインにはパスワードが必要です。"
-      resend_title: "アクティベーションメールを再送"
+      resend_title: "アクティベーションメールの再送"
       change_email: "メールアドレスを変更"
       provide_new_email: "新しいメールアドレスを入力すると、確認メールを再送します。"
       submit_new_email: "メールアドレスを更新"
@@ -1752,7 +1752,7 @@ ja:
       activities: アクティビティ
       objects: オブジェクト
       symbols: シンボル
-      flags: 旗
+      flags: 通報
       recent: 最近使ったもの
       default_tone: スキントーンなし
       light_tone: ライトスキントーン
@@ -1951,13 +1951,13 @@ ja:
       group_message_summary:
         other: "%{group_name} の受信トレイに %{count} 件のメッセージがあります"
       popup:
-        mentioned: '「%{topic}」で %{username} にメンションされました - %{site_title}'
-        group_mentioned: '「%{topic}」で %{username} にメンションされました - %{site_title}'
-        quoted: '「%{topic}」で %{username} に引用されました - %{site_title}'
-        replied: '「%{topic}」で %{username} があなたに返信しました - %{site_title}'
+        mentioned: '%{username} が「%{topic}」であなたをメンションしました - %{site_title}'
+        group_mentioned: '%{username} が「%{topic}」であなたをメンションしました - %{site_title}'
+        quoted: '%{username} が「%{topic}」であなたを引用しました - %{site_title}'
+        replied: '%{username} が「%{topic}」であなたに返信しました - %{site_title}'
         posted: '%{username} が「%{topic}」に投稿しました - %{site_title}'
         private_message: '「%{topic}」で %{username} があなたに個人メッセージを送信しました - %{site_title}'
-        linked: '%{username} が 「%{topic}」のあなたの投稿にリンクしました - %{site_title}'
+        linked: '%{username} が「%{topic}」のあなたの投稿にリンクしました - %{site_title}'
         watching_first_post: '%{username} が新規トピック「%{topic}」を作成しました - %{site_title}'
         confirm_title: "通知を有効にしました - %{site_title}"
         confirm_body: "成功！通知を有効にしました！"
@@ -1979,8 +1979,8 @@ ja:
         granted_badge: "バッジを獲得しました"
         invited_to_topic: "トピックに招待されました"
         group_mentioned: "グループがメンションされました"
-        group_message_summary: "新着のグループメッセージ"
-        watching_first_post: "新着トピック"
+        group_message_summary: "新規グループメッセージ"
+        watching_first_post: "新規トピック"
         topic_reminder: "トピックのリマインダー"
         liked_consolidated: "新しい「いいね！」"
         post_approved: "投稿が承認されました"
@@ -2078,7 +2078,7 @@ ja:
         max_views:
           placeholder: 最大
     hamburger_menu: "他のトピックリストやカテゴリに移動"
-    new_item: "新着"
+    new_item: "新規"
     go_back: "戻る"
     not_logged_in_user: "現在のアクティビティと設定に関するユーザーの概要ページ"
     current_user: "ユーザーページに移動"
@@ -2092,16 +2092,16 @@ ja:
         relist_topics: "トピックを表示"
         reset_read: "未読に設定"
         delete: "トピックを削除"
-        dismiss: "無視"
-        dismiss_read: "未読をすべて無視する"
+        dismiss: "閉じる"
+        dismiss_read: "未読をすべて閉じる"
         dismiss_read_with_selected:
           other: "未読の %{count} 件を閉じる"
-        dismiss_button: "無視..."
+        dismiss_button: "閉じる..."
         dismiss_button_with_selected:
           other: "閉じる (%{count})…"
-        dismiss_tooltip: "新規投稿のみを無視するかトピックの追跡を停止します"
+        dismiss_tooltip: "新規投稿のみを閉じるかトピックの追跡を停止します"
         also_dismiss_topics: "これらのトピックの追跡を停止して、未読として表示されないようにする"
-        dismiss_new: "新規を無視"
+        dismiss_new: "新規を閉じる"
         dismiss_new_with_selected:
           other: "新規を閉じる (%{count})"
         toggle: "トピックの一括選択を切り替える"
@@ -2109,7 +2109,7 @@ ja:
         change_category: "カテゴリを設定"
         close_topics: "トピックをクローズ"
         archive_topics: "トピックをアーカイブ"
-        move_messages_to_inbox: "受信トレイへ移動"
+        move_messages_to_inbox: "受信トレイに移動"
         notification_level: "通知"
         change_notification_level: "通知レベルを変更"
         choose_new_category: "このトピックの新しいカテゴリを選択:"
@@ -2141,7 +2141,7 @@ ja:
         latest: "最新のトピックは以上です。"
         posted: "投稿のあるトピックは以上です。"
         read: "既読のトピックは以上です。"
-        new: "新着トピックは以上です。"
+        new: "新規トピックは以上です。"
         unread: "未読のトピックは以上です。"
         category: "%{category} のトピックは以上です。"
         tag: "%{tag} のトピックは以上です。"
@@ -2167,10 +2167,10 @@ ja:
         help: "未読にする"
         title: "取り下げる"
       list: "トピック"
-      new: "新着トピック"
+      new: "新規トピック"
       unread: "未読"
       new_topics:
-        other: "%{count} 件の新着トピック"
+        other: "%{count} 件の新規トピック"
       unread_topics:
         other: "%{count} 件の未読トピック"
       title: "トピック"
@@ -2219,7 +2219,7 @@ ja:
         durations:
           10_minutes: "10 分間"
           15_minutes: "15分"
-          30_minutes: "30分"
+          30_minutes: "30 分"
           45_minutes: "45分"
           1_hour: "１時間"
           2_hours: "２時間"
@@ -2432,7 +2432,7 @@ ja:
           other: "全体に固定されているトピック: <strong class='badge badge-notification unread'>%{count} 件</strong>"
         make_banner: "このトピックをすべてのページの上部に表示されるバナーにします。"
         remove_banner: "すべてのページの上部に表示されるバナーを削除します。"
-        banner_note: "ユーザーはバナーを閉じることができます。任意のタイミングでバナー表示できるのは１つのトピックだけです。"
+        banner_note: "ユーザーはバナーを閉じることができます。任意のタイミングでバナー表示できるのは 1 つのトピックだけです。"
         no_banner_exists: "バナートピックはありません。"
         banner_exists: "現在、バナートピックが<strong class='badge badge-notification unread'>あります</strong>。"
       inviting: "招待中..."
@@ -2451,7 +2451,7 @@ ja:
       invite_reply:
         title: "招待"
         username_placeholder: "ユーザー名"
-        action: "招待状を送信"
+        action: "招待を送信"
         help: "メールまたは通知で、ほかのユーザーをこのトピックに招待する"
         to_forum: "あなたの友人がリンクをクリックしてすぐに参加できるように、簡単なメールを送信します。"
         discourse_connect_enabled: "このトピックに招待する人のユーザー名を入力してください。"
@@ -2460,7 +2460,7 @@ ja:
         to_topic_username: "ユーザー名を入力しました。このトピックへの招待リンクを記載した通知を送信します。"
         to_username: "招待する人のユーザ名を入れてください。このトピックへの招待リンクを記載した通知を送信します。"
         email_placeholder: "name@example.com"
-        success_email: "<b>%{invitee}</b> に招待状を送信しました。招待が承諾されたらお知らせします。招待のステータスは、ユーザーページの招待タブで確認できます。"
+        success_email: "<b>%{invitee}</b> に招待を送信しました。招待が承諾されたらお知らせします。招待のステータスは、ユーザーページの招待タブで確認できます。"
         success_username: "ユーザーをこのトピックへ招待しました。"
         error: "その人を招待できませんでした。すでに招待を送信していませんか？ (招待できる数には限りがあります)"
         success_existing_email: "<b>%{emailOrUsername}</b> のユーザーはすでに存在します。このトピックに参加するように、このユーザーを招待しました。"
@@ -2598,9 +2598,9 @@ ja:
       in_reply_to: "親投稿を読み込む"
       view_all_posts: "すべての投稿を表示"
       errors:
-        create: "投稿を作成中にエラーが発生しました。もう一度やり直してください。"
-        edit: "投稿を編集中にエラーが発生しました。もう一度やり直してください。"
-        upload: "ファイルのアップロード中にエラーが発生しました。もう一度やり直してください。"
+        create: "投稿を作成中にエラーが発生しました。もう一度お試しください。"
+        edit: "投稿を編集中にエラーが発生しました。もう一度お試しください。"
+        upload: "ファイルのアップロード中にエラーが発生しました。もう一度お試しください。"
         file_too_large: "ファイルが大きすぎます (最大サイズは %{max_size_kb} kb です)。クラウド共有サービスにアップロードしてから、そのリンクを貼り付けてはどうですか？"
         too_many_uploads: "複数のファイルを同時にアップロードすることはできません。"
         too_many_dragged_and_dropped_files:
@@ -3028,11 +3028,11 @@ ja:
           other: "未読 %{count}"
       new:
         lower_title_with_count:
-          other: "新着 %{count}"
-        lower_title: "新着"
-        title: "新着"
+          other: "新規 %{count}"
+        lower_title: "新規"
+        title: "新規"
         title_with_count:
-          other: "新着 (%{count})"
+          other: "新規 (%{count})"
         help: "数日以内に作成されたトピック"
       posted:
         title: "自分の投稿"
@@ -3092,7 +3092,7 @@ ja:
         title: "ページ移動"
         home: "%{shortcut} ホーム"
         latest: "%{shortcut} 最新"
-        new: "%{shortcut} 新着"
+        new: "%{shortcut} 新規"
         unread: "%{shortcut} 未読"
         categories: "%{shortcut} カテゴリ"
         top: "%{shortcut} トップへ"
@@ -3160,7 +3160,7 @@ ja:
         mark_watching: "%{shortcut} トピックをウォッチ"
         print: "%{shortcut} トピックを印刷"
         defer: "%{shortcut} トピックを未読にする"
-        topic_admin_actions: "%{shortcut} トピックの管理者アクションを開く"
+        topic_admin_actions: "%{shortcut} トピックの管理者操作を開く"
       search_menu:
         title: "検索メニュー"
         prev_next: "%{shortcut} 選択を上下に移動"
@@ -3232,7 +3232,7 @@ ja:
       sort_by: "並べ替え:"
       sort_by_count: "件数"
       sort_by_name: "名前"
-      manage_groups: "タグのグループを管理"
+      manage_groups: "タググループを管理"
       manage_groups_description: "グループを定義してタグを整理します"
       upload: "タグをアップロード"
       upload_description: "csv ファイルをアップロードしてタグを一括作成します"
@@ -3258,13 +3258,13 @@ ja:
           description: "このタグのついたすべてのトピックを自動的にウォッチします。すべての新しい投稿とトピックが通知され、トピックの隣に未読と新しい投稿の件数が表示されます。"
         watching_first_post:
           title: "最初の投稿をウォッチ中"
-          description: "このタグの新着トピックは通知されますが、トピックへの返信は通知されません。"
+          description: "このタグの新規トピックは通知されますが、トピックへの返信は通知されません。"
         tracking:
           title: "追跡中"
           description: "このタグが付いたすべてのトピックを自動的に追跡します。トピックの隣に未読と新しい投稿の件数が表示されます。"
         regular:
           title: "通常"
-          description: "誰かが @ユーザー名であなたをメンションしたり、あなたに返信したりすると通知が送信されます。"
+          description: "誰かが @ユーザー名であなたをメンションしたり、あなたの投稿に返信したりすると通知が送信されます。"
         muted:
           title: "ミュート"
           description: "このタグのついた新しいトピックについては何も通知されず、未読タブにも表示されません。"
@@ -3296,14 +3296,14 @@ ja:
       topics:
         none:
           unread: "未読のトピックはありません。"
-          new: "新着トピックはありません。"
+          new: "新規トピックはありません。"
           read: "まだトピックを一つも読んでいません。"
           posted: "まだトピックを一つも投稿していません。"
           latest: "最新のトピックはありません。"
           bookmarks: "ブックマークしたトピックはありません。"
           top: "人気のトピックはありません。"
     invite:
-      custom_message: "<a href>カスタムメッセージ</a>で、招待状をもう少し個人的にします。"
+      custom_message: "<a href>カスタムメッセージ</a>で、招待をもう少し個人的にします。"
       custom_message_placeholder: "カスタムメッセージを入力"
       approval_not_required: "ユーザーはこの招待を承認するとすぐに自動認証されます。"
       custom_message_template_forum: "このフォーラムに参加しませんか？"
@@ -3346,7 +3346,7 @@ ja:
       moderator: "モデレーター"
       tags:
         remove_muted_tags_from_latest:
-          always: "常に"
+          always: "常時"
           only_muted: "単独で使用された場合、または他のミュートされたタグを使用された場合"
           never: "削除しない"
       reports:
@@ -3405,7 +3405,7 @@ ja:
         disabled: 無効化
         timeout_error: クエリに時間が掛かり過ぎています。より短い間隔を選択してください
         exception_error: クエリを実行中にエラーが発生しました
-        too_many_requests: このアクションの実行回数が多すぎます。しばらくしてからもう一度お試しください。
+        too_many_requests: この操作の実行回数が多すぎます。しばらくしてからもう一度お試しください。
         not_found_error: このレポートは存在しません
         filter_reports: レポートをフィルタ
         reports:
@@ -3537,7 +3537,7 @@ ja:
         delete: 永久に削除
         not_shown_again: このキーは二度と表示されません。続行する前に必ずコピーしてください。
         continue: 続行
-        use_global_key: グローバルキー (すべてのアクションを許可)
+        use_global_key: グローバルキー (すべての操作を許可)
         scopes:
           description: |
             スコープを使用する場合、API キーを特定のエンドポイントのセットに制限できます。
@@ -3748,8 +3748,8 @@ ja:
       export_json:
         button_text: "エクスポート"
       invite:
-        button_text: "招待状を送信"
-        button_title: "招待状を送信"
+        button_text: "招待を送信"
+        button_title: "招待を送信"
       customize:
         title: "カスタマイズ"
         long_title: "サイトのカスタマイズ"
@@ -3773,8 +3773,8 @@ ja:
           subject: "件名"
           multiple_subjects: "このメールテンプレートには複数の件名があります。"
           body: "本文"
-          revert: "変更を元に戻す"
-          revert_confirm: "変更を元に戻してよろしいですか？"
+          revert: "変更を戻す"
+          revert_confirm: "変更を戻してよろしいですか？"
         theme:
           theme: "テーマ"
           component: "コンポーネント"
@@ -4077,7 +4077,7 @@ ja:
             title: "フィルタ"
             user_placeholder: "ユーザー名"
             address_placeholder: "name@example.com"
-            type_placeholder: "ダイジェスト、サインアップ..."
+            type_placeholder: "ダイジェスト、アカウント登録..."
             reply_key_placeholder: "返信キー"
       moderation_history:
         performed_by: "実行者:"
@@ -4167,7 +4167,7 @@ ja:
             backup_download: "バックアップのダウンロード"
             backup_destroy: "バックアップの消去"
             reviewed_post: "投稿をレビュー"
-            custom_staff: "プラグインのカスタムアクション"
+            custom_staff: "プラグインのカスタム操作"
             post_locked: "投稿をロック"
             post_edit: "投稿を編集"
             post_unlocked: "投稿のロックを解除"
@@ -4202,7 +4202,7 @@ ja:
             override_upload_secure_status: "アップロードの安全ステータスをオーバーライド"
             page_published: "ページを公開"
             page_unpublished: "ページを非公開"
-            add_email: "メールを追加"
+            add_email: "メールアドレスを追加"
             update_email: "メールを更新"
             destroy_email: "メールを消去"
             topic_closed: "トピックをクローズ"
@@ -4265,7 +4265,7 @@ ja:
           other: "%{count} 語を表示"
         download: ダウンロード
         clear_all: すべてクリア
-        clear_all_confirm: "%{action}アクションのすべてのウォッチ語をクリアしてもよろしいですか？"
+        clear_all_confirm: "%{action}操作のすべてのウォッチ語をクリアしてもよろしいですか？"
         invalid_regex: 'ウォッチ語 "%{word}" は無効な正規表現です。'
         regex_warning: '<a href="%{basePath}/admin/site_settings/category/all_results?filter=watched%20words%20regular%20expressions%20">ウォッチ語は正規表現</a>で、語の境界は自動的に含まれることはありません。全語に一致する正規表現が必要な場合は、正規表現の最初と最後に <code>\b</code> を含めます。'
         actions:
@@ -4409,8 +4409,8 @@ ja:
         revoke_admin: "管理者権限を取り消す"
         grant_admin: "管理者権限を付与"
         grant_admin_confirm: "新しい管理者を確認するためのメールを送信しました。開封して記載されている指示に従ってください。"
-        revoke_moderation: "モデレータ権限を取り消す"
-        grant_moderation: "モデレータ権限を付与"
+        revoke_moderation: "モデレーター権限を取り消す"
+        grant_moderation: "モデレーター権限を付与"
         unsuspend: "凍結を解除"
         suspend: "凍結"
         show_flags_received: "受信した通報を表示"
@@ -4530,8 +4530,8 @@ ja:
           visits: "アクセス"
           days: "日"
           topics_replied_to: "返信するトピック"
-          topics_viewed: "閲覧したトピック"
-          topics_viewed_all_time: "閲覧したトピック (全期間)"
+          topics_viewed: "閲覧したトピック数"
+          topics_viewed_all_time: "閲覧したトピック数 (全期間)"
           posts_read: "閲覧した投稿数"
           posts_read_all_time: "閲覧した投稿数 (全期間)"
           flagged_posts: "通報された投稿"
@@ -4574,11 +4574,11 @@ ja:
         delete_confirm: "このユーザーフィールドを削除してもよろしいですか？"
         options: "オプション"
         required:
-          title: "サインアップ時の必須にしますか？"
+          title: "登録時の必須にしますか？"
           enabled: "必須"
           disabled: "オプション"
         editable:
-          title: "サインアップ後に編集可能にしますか？"
+          title: "登録後に編集可能にしますか？"
           enabled: "編集可能"
           disabled: "編集不可"
         show_on_profile:
@@ -4715,8 +4715,8 @@ ja:
         graphic: グラフィック
         icon_help: "Font Awesome アイコン名を入力します (通常のアイコンには接頭辞 'far-' を、ブランドアイコンには 'fab-' を使用します)"
         image_help: "画像をアップロードすると、両方が設定されている場合、アイコンフィールドがオーバーライドされます。"
-        select_an_icon: "アイコンを選択"
-        upload_an_image: "画像をアップロード"
+        select_an_icon: "アイコンを選択する"
+        upload_an_image: "画像をアップロードする"
         read_only_setting_help: "テキストをカスタマイズする"
         query: バッジクエリ (SQL)
         target_posts: クエリターゲット投稿
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index be57f18471..7f3e0252cb 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -3217,6 +3217,7 @@ pl_PL:
       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"
       num_auto_bump_daily: "Liczba otwartych tematów do automatycznego podbicia każdego dnia"
       navigate_to_first_post_after_read: "Przejdź do pierwszego postu po przeczytaniu tematów"
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index 91169c7f15..14f6446f45 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -205,7 +205,7 @@ pt_BR:
     log_in: "Entrar"
     age: "Idade"
     joined: "Ingressou"
-    admin_title: "Administrador"
+    admin_title: "Administrador(a)"
     show_more: "exibir mais"
     show_help: "opções"
     links: "Links"
@@ -261,7 +261,7 @@ pt_BR:
       topic_count: "Tópicos"
       post_count: "Mensagens"
       user_count: "Usuários"
-      active_user_count: "Usuários ativos"
+      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}."
     bookmarked:
@@ -285,7 +285,7 @@ pt_BR:
       no_timezone: 'Você ainda não definiu um fuso horário. Você não poderá definir lembretes. Configure um <a href="%{basePath}/my/preferences/profile">no seu perfil</a>.'
       invalid_custom_datetime: "A data e a hora que você informou são inválidas, tente novamente."
       list_permission_denied: "Você não tem permissão para visualizar os favoritos deste usuário(a)."
-      no_user_bookmarks: "Você não tem mensagens marcadas como favoritas. Os favoritos permitem que você acesse rapidamente mensagens específicas."
+      no_user_bookmarks: "Você não tem postagens favoritas. Os favoritos permitem que você consulte rapidamente postagens específicas."
       auto_delete_preference:
         label: "Excluir automaticamente"
         never: "Nunca"
@@ -440,7 +440,7 @@ pt_BR:
         reported_by: "Relatado(a) por"
         deleted: "[Tópico excluído]"
         original: "(tópico original)"
-        details: "informações"
+        details: "detalhes"
         unique_users:
           one: "%{count} usuário"
           other: "%{count} usuários"
@@ -483,13 +483,13 @@ pt_BR:
         reviewed_by: "Revisado por"
       statuses:
         pending:
-          title: "Pendente"
+          title: "Pendentes"
         approved:
           title: "Aprovado"
         rejected:
           title: "Rejeitado"
         ignored:
-          title: "Ignorado"
+          title: "Ignorados(as)"
         deleted:
           title: "Excluído"
         reviewed:
@@ -605,7 +605,7 @@ pt_BR:
       member_added: "Adicionado"
       member_requested: "Solicitado em"
       add_members:
-        title: "Adicionar usuários (a) a %{group_name}"
+        title: "Adicionar usuários(a) a %{group_name}"
         description: "Insira uma lista de usuários(as) que você quer convidar para o grupo ou cole em uma lista separada por vírgulas:"
         usernames_placeholder: "nomes de usuário(a)"
         usernames_or_emails_placeholder: "nomes de usuário(a) ou e-maiis"
@@ -676,7 +676,7 @@ pt_BR:
             none_found: "Nenhuma caixa de mensagens foi encontrada nesta conta de e-mail."
             disabled: "Desativado(a)"
         membership:
-          title: Assinatura
+          title: Associação
           access: Acesso
         categories:
           title: Categorias
@@ -701,7 +701,7 @@ pt_BR:
           when: "Quando"
           action: "Ação"
           acting_user: "Usuário agindo"
-          target_user: "Usuário(a)-alvo"
+          target_user: "Usuário(a) de destino"
           subject: "Assunto"
           details: "Detalhes"
           from: "De"
@@ -737,7 +737,7 @@ pt_BR:
       group_name: "Nome do grupo"
       user_count: "Usuários(as)"
       bio: "Sobre o grupo"
-      selector_placeholder: "insira nome do(a) usuário(a)"
+      selector_placeholder: "insira o nome do(a) usuário(a)"
       owner: "proprietário(a)"
       index:
         title: "Grupos"
@@ -895,7 +895,7 @@ pt_BR:
       username: "nome do(a) usuário(a)"
       trust_level: "NC"
       read_time: "tempo de leitura"
-      topics_entered: "tópicos visualizados"
+      topics_entered: "tópicos inseridos"
       post_count: "# postagens"
       confirm_delete_other_accounts: "Tem certeza de que deseja excluir estas contas?"
       powered_by: "usando <a href='https://maxmind.com'>MaxMindDB</a>"
@@ -1169,7 +1169,7 @@ pt_BR:
         use: "Usar app autenticador"
         enforced_notice: "Você precisa ativar a autenticação de dois fatores antes de acessar este site."
         disable: "Desativar"
-        disable_confirm: "Tem certeza que você quer desativar todo os métodos de dois fatores?"
+        disable_confirm: "Tem certeza que você quer desativar todos os métodos de dois fatores?"
         save: "Salvar"
         edit: "Editar"
         edit_title: "Editar autenticador"
@@ -1247,7 +1247,7 @@ pt_BR:
         auth_override_instructions: "É possível atualizar o e-mail com o provedor de autenticação."
         no_secondary: "Nenhum e-mail secundário"
         instructions: "Nunca visível publicamente."
-        admin_note: "Observação: se um usuário(a) administrador(a) alterar o e-mail de um(a) usuário(a) não administrador(a), esse usuário perderá acesso à sua conta de e-mail original, de modo que um e-mail de redefinição de senha será enviado para o novo endereço. O e-mail do usuário não será alterado até que o processo de redefinição de senha seja concluído."
+        admin_note: "Observação: se um usuário(a) administrador(a) alterar o e-mail de um(a) usuário(a) não administrador(a), esse usuário(a) perderá acesso à sua conta de e-mail original, de modo que um e-mail de redefinição de senha será enviado para o novo endereço. O e-mail do usuário não será alterado até que o processo de redefinição de senha seja concluído."
         ok: "Enviaremos um e-mail para confirmar"
         required: "Digite um endereço de e-mail"
         invalid: "Insira um endereço de e-mail válido"
@@ -1388,7 +1388,7 @@ pt_BR:
         pending_tab_with_count: "Pendentes (%{count})"
         expired_tab: "Expirado(a)"
         expired_tab_with_count: "Expirado(a) (%{count})"
-        redeemed_tab: "Resgatados"
+        redeemed_tab: "Resgatados(as)"
         redeemed_tab_with_count: "Resgatados (%{count})"
         invited_via: "Convite"
         invited_via_link: "vincular %{key} (%{count}/%{max} resgatado(s))"
@@ -1675,7 +1675,7 @@ pt_BR:
       logging_in_as: Entrando como %{email}
       confirm_button: Terminar de entrar
     login:
-      header_title: "Boas-vinda outra vez"
+      header_title: "Boas-vindas outra vez"
       subheader_title: "Entrar com a sua conta"
       title: "Entrar"
       username: "Usuário(a)"
@@ -1686,7 +1686,7 @@ pt_BR:
       second_factor_backup_title: "Backup de dois fatores"
       second_factor_backup_description: "Insira um dos seus códigos de backup:"
       second_factor: "Fazer login usando um aplicativo de autenticação"
-      security_key_description: "Quando você tiver uma chave física de segurança preparada, pressione o botão abaixo Autenticar com chave de segurança."
+      security_key_description: "Quando você tiver sua chave física de segurança preparada, pressione o botão Autenticar com chave de segurança abaixo."
       security_key_alternative: "Tentar de outra maneira"
       security_key_authenticate: "Autenticar com chave de segurança"
       security_key_not_allowed_error: "O processo de autenticação com chave de segurança atingiu o limite de tempo ou foi cancelado."
@@ -1744,7 +1744,7 @@ pt_BR:
     invites:
       accept_title: "Convite"
       emoji: "emoji de envelope"
-      welcome_to: "Boas-vindas a %{site_name}!"
+      welcome_to: "Boas-vindas ao %{site_name}!"
       invited_by: "Você foi convidado(a) por:"
       social_login_available: "Você também poderá entrar com qualquer rede social usando este e-mail."
       your_email: "O endereço de e-mail da sua conta é <b>%{email}</b>."
@@ -1852,8 +1852,8 @@ pt_BR:
       drafts_offline: "rascunhos off-line"
       edit_conflict: "editar conflito"
       group_mentioned_limit:
-        one: "<b>Aviso!</b> Você menciou <a href='%{group_link}'>%{group}</a>, mas este grupo tem mais membros do que o limite de menções configurado pelo(a) administrador(a) de %{count} usuário. Ninguém será notificado(a)."
-        other: "<b>Aviso!</b> Você menciou <a href='%{group_link}'>%{group}</a>, mas este grupo tem mais membros do que o limite de menções configurado pelo(a) administrador(a) de %{count} usuários. Ninguém será notificado(a)."
+        one: "<b>Aviso!</b> Você menciou <a href='%{group_link}'>%{group}</a>, mas este grupo tem mais membros do que o limite de menções configurado pelo(a) administrador(a) de %{count} usuário(a). Ninguém será notificado(a)."
+        other: "<b>Aviso!</b> Você menciou <a href='%{group_link}'>%{group}</a>, mas este grupo tem mais membros do que o limite de menções configurado pelo(a) administrador(a) de %{count} usuários(as). Ninguém será notificado(a)."
       group_mentioned:
         one: "Ao mencionar %{group}, você está prestes a notificar <a href='%{group_link}'>%{count} pessoa</a>. Tem certeza?"
         other: "Ao mencionar %{group}, você está prestes a notificar <a href='%{group_link}'>%{count} pessoas</a>. Tem certeza?"
@@ -1887,8 +1887,8 @@ pt_BR:
       reply: "Responder"
       cancel: "Cancelar"
       create_topic: "Criar tópico"
-      create_pm: "Criar mensagem"
-      create_whisper: "Criar sussurro"
+      create_pm: "Mensagem"
+      create_whisper: "Sussuro"
       create_shared_draft: "Criar rascunho compartilhado"
       edit_shared_draft: "Editar rascunho compartilhado"
       title: "Ou pressione Ctrl+Enter"
@@ -1903,7 +1903,7 @@ pt_BR:
       reply_placeholder_choose_category: "Selecione uma categoria antes de digitar aqui."
       view_new_post: "Veja a sua nova postagem."
       saving: "Salvando"
-      saved: "Salvou!"
+      saved: "Salvo!"
       saved_draft: "Rascunho de postagem em andamento. Toque para retomar."
       uploading: "Enviando..."
       show_preview: "exibir pré-visualização"
@@ -1961,7 +1961,7 @@ pt_BR:
           confirm: Você tem um novo rascunho de tópico salvo, que será substituído ao criar um tópico vinculado.
         reply_as_new_group_message:
           label: Responder como nova mensagem de grupo
-          desc: Crie uma nova mensagem começando com os mesmo destinatários
+          desc: Crie uma nova mensagem começando com os mesmos destinatários
         reply_as_private_message:
           label: Nova mensagem
           desc: Criar uma nova mensagem pessoal
@@ -2391,7 +2391,7 @@ pt_BR:
         other: "A última postagem no tópico já foi feita há %{count} horas, portanto o tópico será fechado imediatamente."
       auto_close_momentarily:
         one: "A última postagem no tópico foi feita há %{count} hora, portanto o tópico será fechado momentaneamente."
-        other: "A última postagem no tópico foi feita há %{count} hora, portanto o tópico será fechado momentaneamente."
+        other: "A última postagem no tópico foi feita há %{count} horas, portanto o tópico será fechado momentaneamente."
       timeline:
         back: "Voltar"
         back_description: "Voltar para a sua última postagem não lida"
@@ -2629,9 +2629,9 @@ pt_BR:
         publishing_settings: "Configurações de publicação"
       change_owner:
         title: "Trocar autor(a)"
-        action: "trocar autor(a)"
+        action: "trocar propriedade"
         error: "Houve um erro ao alterar o(a) autor(a) destas publicações."
-        placeholder: "novo(a) autor(a)"
+        placeholder: "nome do(a) usuário(a) do(a) novo(a) proprietário(a)"
         instructions:
           one: "Escolha um(a) novo(a) proprietário(a) para a postagem de <b>@%{old_user}</b>"
           other: "Escolha um(a) novo(a) proprietário(a) para as %{count} postagens de <b>@%{old_user}</b>"
@@ -2976,7 +2976,7 @@ pt_BR:
           title: "Acompanhando"
           description: "Você acompanhará automaticamente todos os tópicos nesta categoria. Você será notificado(a) de todas as novas postagens em todos os tópicos. Além disso, uma contagem de novas respostas será exibida."
         watching_first_post:
-          title: "Acompanhando o primeiro post"
+          title: "Acompanhando a primeira postagem"
           description: "Você será notificado(a) sobre novos tópicos nesta categoria, mas não sobre respostas dos tópicos."
         tracking:
           title: "Monitorando"
@@ -3023,7 +3023,7 @@ pt_BR:
         none: "nenhuma subcategoria"
       colors_disabled: "Não é possível selecionar cores porque você tem um, ou não tem nenhum, estilo de categoria."
     flagging:
-      title: "Obrigado por ajudar a tornar a nossa comunidade um ambiente seguro!"
+      title: "Obrigado por ajudar a tornar a nossa comunidade um ambiente saudável!"
       action: "Sinalizar resposta"
       take_action: "Tomar medida..."
       take_action_options:
@@ -3032,7 +3032,7 @@ pt_BR:
           details: "Atingir o limite de denuncias imediatamente em vez de esperar por mais denuncias da comunidade"
         suspend:
           title: "Suspender usuário(a)"
-          details: "Alcance o limite de sinalizadores e suspensa o(a) usuário(a)"
+          details: "Alcance o limite de sinalizadores e suspenda o(a) usuário(a)"
         silence:
           title: "Silenciar usuário(a)"
           details: "Alcance o limite de sinalizadores e silencie o(a) usuário(a)"
@@ -3040,7 +3040,7 @@ pt_BR:
       official_warning: "Aviso oficial"
       delete_spammer: "Excluir remetente de spam"
       flag_for_review: "Fila para revisão"
-      delete_confirm_MF: "Você está prestes a excluir {POSTS, plural, one {<b>#</b> postagem} other {<b>#</b> postagens}} e {TOPICS, plural, one {<b>#</b> tópico} other {<b>#</b> tópicos}} deste(a) usuário(a), remover sua conta, bloquear cadastros a partir do seu endereço IP <b>{ip_address}</b> e adicionar seu endereço de e-mail <b>{email}</b> a uma lista de bloqueio permanente. Você tem certeza que este(a) usuário(a) é realmente um remetente de spam?"
+      delete_confirm_MF: "Você está prestes a excluir {POSTS, plural, one {<b>#</b> postagem} other {<b>#</b> postagens}} e {TOPICS, plural, one {<b>#</b> tópico} other {<b>#</b> tópicos}} deste(a) usuário(a), remover sua conta, bloquear cadastros a partir do seu endereço IP <b>{ip_address}</b> e adicionar seu endereço de e-mail <b>{email}</b> a uma lista de bloqueio permanente. Você tem certeza que este(a) usuário(a) é realmente remetente de spam?"
       yes_delete_spammer: "Sim, excluir remetente de spam"
       ip_address_missing: "(N/D)"
       hidden_email_address: "(oculto)"
@@ -3197,9 +3197,9 @@ pt_BR:
         monthly:
           title: "Todo mês"
         weekly:
-          title: "Toda semana"
+          title: "A cada semana"
         daily:
-          title: "Todo dia"
+          title: "A cada dia"
         all_time: "Desde o início"
         this_year: "Ano"
         this_quarter: "Trimestre"
@@ -3573,9 +3573,9 @@ pt_BR:
           view_table: "tabela"
           view_graph: "gráfico"
           refresh_report: "Atualizar relatório"
-          daily: Todo dia
+          daily: A cada dia
           monthly: Todo mês
-          weekly: Toda semana
+          weekly: A cada semana
           dates: "Datas (UTC)"
           groups: "Todos os grupos"
           disabled: "Este relatório está desativado"
@@ -4078,7 +4078,7 @@ pt_BR:
             title: "Insira o CSS personalizado para entregar com a versão incorporada dos comentários"
           color_definitions:
             text: "Definições de cor"
-            title: "Digite definições de cor personalizadas (apeans usuários(as) avançados(as))"
+            title: "Digite definições de cor personalizadas (apenas usuários(as) avançados(as))"
             placeholder: |2-
 
               Use esta folha de estilo para adicionar cores personalizadas à lista de propriedades personalizadas do CSS.
@@ -4207,7 +4207,7 @@ pt_BR:
         html_preview: "Prévia do conteúdo do e-mail"
         last_seen_user: "Último(a) usuário(a) visto(a):"
         no_result: "Nenhum resultado encontrado."
-        reply_key: "Chave da resposta"
+        reply_key: "Tecla de resposta"
         skipped_reason: "Pular motivo"
         incoming_emails:
           from_address: "De"
@@ -4295,8 +4295,8 @@ pt_BR:
             grant_badge: "conceder emblema"
             revoke_badge: "revogar emblema"
             check_email: "conferir e-mail"
-            delete_topic: "explorar tópico"
-            recover_topic: "cancelar exclusão do tópico"
+            delete_topic: "excluir tópico"
+            recover_topic: "restaurar tópico"
             delete_post: "excluir mensagem"
             impersonate: "representar"
             anonymize_user: "tornar usuário(a) anônimo(a)"
@@ -4672,7 +4672,7 @@ pt_BR:
           some: "Algumas devoluções foram recebidas recentemente desse e-mail."
           threshold_reached: "Muitas devoluções desse e-mail foram recebidas."
         trust_level_change_failed: "Houve um problema ao trocar o nível de confiança do(a) usuário(a)."
-        suspend_modal_title: "Usuário(a) suspenso(a)"
+        suspend_modal_title: "Suspender usuário(a)"
         confirm_cancel_penalty: "Tem certeza de que deseja descartar a penalidade?"
         trust_level_2_users: "Usuários(as) de nível de confiança 2"
         trust_level_3_requirements: "Requisitos de nível de confiança 3"
@@ -4697,7 +4697,7 @@ pt_BR:
           topics_viewed_all_time: "Tópicos visualizados (desde o início)"
           posts_read: "Postagens lidas"
           posts_read_all_time: "Postagens lidas (desde o início)"
-          flagged_posts: "Mensagens sinalizadas"
+          flagged_posts: "Postagens sinalizadas"
           flagged_by_users: "Usuários(as) que foram sinalizados(as)"
           likes_given: "Curtidas dadas"
           likes_received: "Curtidas recebidas"
@@ -4968,7 +4968,7 @@ pt_BR:
         url: "URL"
         topic_id: "ID do tópico"
         topic_title: "Tópico"
-        post_id: "ID da mensagem"
+        post_id: "ID da postagem"
         post_title: "Mensagem"
         category_id: "ID da categoria"
         category_title: "Categoria"
@@ -5009,7 +5009,7 @@ pt_BR:
         add_user: "adicionar"
         none_added: "Você ainda não convidou ninguém para a equipe. Tem certeza que deseja continuar?"
         roles:
-          admin: "Administrador(a)?"
+          admin: "Administrador(a)"
           moderator: "Moderador(a)"
           regular: "Usuário regular"
       previews:
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 084947773e..4b85d1939d 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -2111,6 +2111,7 @@ ru:
           confirm: У вас есть сохранённый черновик новой темы, который будет перезаписан, если вы создадите связанную тему.
         reply_as_new_group_message:
           label: Ответить в виде нового группового сообщения
+          desc: Создать новое личное сообщение с теми же получателями
         reply_as_private_message:
           label: Личное сообщение
           desc: Создать новое личное сообщение
@@ -3217,6 +3218,7 @@ ru:
       position_disabled: "Разделы будут отображаться в порядке активности. Чтобы настроить порядок разделов, "
       position_disabled_click: 'включите настройку "fixed category positions".'
       minimum_required_tags: "Минимальное количество тегов, требуемых в теме:"
+      default_slow_mode: 'Включать замедленный режим для тем, создаваемых в этом разделе.'
       parent: "Родительский раздел"
       num_auto_bump_daily: "Число открытых тем для автоматического ежедневного поднятия:"
       navigate_to_first_post_after_read: "Перейти к первому сообщению после прочтения тем"
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index bdd531149e..9eb5d506f8 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -2968,6 +2968,7 @@ sv:
       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".'
       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"
       num_auto_bump_daily: "Antalet öppnade ämnen för att dagligen automatiskt knuffa ett ämne:"
       navigate_to_first_post_after_read: "Navigera till första inlägget efter att ämnen är lästa"
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 6cf4e9660a..e1eb93a865 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -379,6 +379,7 @@ tr_TR:
         type_bonus:
           name: "tür bonusu"
           title: "Bazı gözden geçirilebilir türlere daha yüksek öncelikli olmaları için personel tarafından bir bonus tahsis edilebilir."
+      stale_help: "Bu gözden geçirme, <b>%{username}</b>tarafından çözüldü."
       claim_help:
         optional: "Başkalarının incelemesini engellemek için bu öğeyi talep edebilirsiniz."
         required: "Öğeleri inceleyebilmeniz için önce hak talebinde bulunmalısınız."
@@ -2965,6 +2966,7 @@ tr_TR:
       position_disabled: "Kategoriler etkinlik sıralarına göre görünecek. Listelerdeki kategorilerin sıralamalarını kontrol edebilmek için,"
       position_disabled_click: '"Sabit kategori pozisyonları" ayarını etkinleştir.'
       minimum_required_tags: "Bir konu için gereken minimum etiket sayısı:"
+      default_slow_mode: 'Bu kategorideki yeni konular için "Yavaş Modu" etkinleştirin.'
       parent: "Üst Kategori"
       num_auto_bump_daily: "Günlük otomatik olarak açılan açık konuların sayısı:"
       navigate_to_first_post_after_read: "Konular okunduktan sonra ilk gönderiye dön"
@@ -3485,6 +3487,8 @@ tr_TR:
         regular: "müdavim"
         leader: "lider"
       detailed_name: "%{level}: %{name}"
+    pick_files_button:
+      unsupported_file_picked: "Desteklenmeyen bir dosya seçtiniz. Desteklenen dosya türleri şunlardır– %{types}."
   admin_js:
     type_to_filter: "filtrelemek için yaz..."
     admin:
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index 34f496dc48..80e89ac54b 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -111,7 +111,7 @@ zh_CN:
       user_left: "%{who} 在 %{when}将自己从此消息中移除"
       removed_user: "%{when}移除了 %{who}"
       removed_group: "%{when}移除了 %{who}"
-      autobumped: "%{when}自动顶帖"
+      autobumped: "%{when}自动提升"
       autoclosed:
         enabled: "%{when}关闭"
         disabled: "%{when}打开"
@@ -141,7 +141,7 @@ zh_CN:
       message: "我们已经更新此站点，请 <span>刷新页面</span>，否则可能会遇到意外行为。"
       dismiss: "关闭"
     bootstrap_mode_enabled:
-      other: "为了更轻松地启动您的新站点，您现在处于引导模式。所有新用户都将被授予信任等级 1，并且已启用每日摘要电子邮件。引导模式会在达到 %{count} 个用户时自动关闭。"
+      other: "为了更轻松地启动您的新站点，您现在处于引导模式。所有新用户都将被授予信任级别 1，并且已启用每日摘要电子邮件。引导模式会在达到 %{count} 个用户时自动关闭。"
     bootstrap_mode_disabled: "引导模式将在 24 小时内禁用。"
     themes:
       default_description: "默认"
@@ -170,7 +170,7 @@ zh_CN:
         us_west_1: "美国西部（北加利福尼亚州）"
         us_west_2: "美国西部（俄勒冈州）"
     clear_input: "清除输入"
-    edit: "编辑此话题的标题和分类"
+    edit: "编辑此话题的标题和类别"
     expand: "展开"
     not_implemented: "抱歉，该功能尚未实现！"
     no_value: "否"
@@ -438,7 +438,7 @@ zh_CN:
       conversation:
         view_full: "查看完整对话"
       scores:
-        about: "此分数是根据举报人的信任等级、该用户以往举报的准确性以及被举报条目的优先级计算得出的。"
+        about: "此分数是根据举报人的信任级别、该用户以往举报的准确性以及被举报条目的优先级计算得出的。"
         score: "分数"
         date: "日期"
         type: "类型"
@@ -1170,7 +1170,7 @@ zh_CN:
         uploaded_avatar_empty: "上传自定义图片"
         upload_title: "上传图片"
         image_is_not_a_square: "警告：我们已经裁剪了您的图片；宽度和高度不相等。"
-        logo_small: "网站的小徽标。默认情况下使用。"
+        logo_small: "站点的小徽标。默认情况下使用。"
       change_profile_background:
         title: "个人资料标题"
         instructions: "个人资料标题将居中且默认宽度为 1110px。"
@@ -1548,7 +1548,7 @@ zh_CN:
       hide_forever: "不，谢谢"
       hidden_for_session: "好的，我们会在明天问您。您也可以随时使用“登录”来创建帐户。"
       intro: "您好！看起来您很喜欢讨论，但您还没有注册帐户。"
-      value_prop: "当您创建帐户时，我们会准确记住您阅读过的内容，因此您总可以从上次停止的地方返回。每当有人回复您时，您还会在此处和通过电子邮件收到通知。您可以为帖子点赞来分享爱。 :heartpulse:"
+      value_prop: "当您创建帐户时，我们会准确记住您阅读过的内容，因此您总可以从上次停止的地方返回。每当有人回复您时，您还会在此处和通过电子邮件收到通知。您可以为帖子点赞来分享爱。:heartpulse:"
     summary:
       enabled_description: "您正在查看此话题的摘要：社区确定的最有趣的帖子。"
       description:
@@ -1594,7 +1594,7 @@ zh_CN:
       complete_email_found: "我们找到一个与 <b>%{email}</b> 匹配的帐户。您应该会收到一封电子邮件，其中包含有关如何尽快重置密码的说明。"
       complete_username_not_found: "没有与用户名 <b>%{username}</b> 相匹配的帐户"
       complete_email_not_found: "没有与 <b>%{email}</b> 相匹配的帐户"
-      help: "没收到电子邮件？务必查看您的垃圾邮件文件夹。<p>不确定使用了哪个电子邮件地址？输入电子邮件地址来查看是否存在。</p><p>如果您无法再访问您的帐户使用的电子邮件地址，请联系<a href='%{basePath}/about'>我们的工作人员</a>。</p>"
+      help: "没收到电子邮件？务必查看您的垃圾邮件文件夹。<p>不确定使用了哪个电子邮件地址？输入电子邮件地址来查看是否存在。</p><p>如果您无法再访问您的帐户使用的电子邮件地址，请联系<a href='%{basePath}/about'>我们的管理人员</a>。</p>"
       button_ok: "确定"
       button_help: "帮助"
     email_login:
@@ -1626,7 +1626,7 @@ zh_CN:
       security_key_description: "当您准备好物理安全密钥后，请按下面的“使用安全密钥进行身份验证”按钮。"
       security_key_alternative: "尝试另一种方式"
       security_key_authenticate: "使用安全密钥进行身份验证"
-      security_key_not_allowed_error: "安全密钥身份验证超时或被取消。"
+      security_key_not_allowed_error: "安全密钥身份验证过程超时或被取消。"
       security_key_no_matching_credential_error: "在提供的安全密钥中找不到匹配的凭据。"
       security_key_support_missing_error: "您当前的设备或浏览器不支持使用安全密钥。请使用其他方法。"
       email_placeholder: "电子邮件/用户名"
@@ -1789,7 +1789,7 @@ zh_CN:
       cannot_see_mention:
         category: "您提及了 %{username}，但由于他们无法访问此类别，他们将不会收到通知。您需要将其添加到可以访问此类别的群组中。"
         private: "您提及了 %{username}，但由于他们无法访问此个人消息，他们将不会收到通知。您需要邀请他们加入此个人消息。"
-      duplicate_link: "好像 <b>@%{username}</b> 在<a href='%{post_url}'>%{ago}的回复</a>中已经发布 <b>%{domain}</b> 的链接 - 确定要再次发布吗？"
+      duplicate_link: "好像 <b>@%{username}</b> 在话题 <a href='%{post_url}'>%{ago}的回复</a>中已经发布 <b>%{domain}</b> 的链接 - 确定要再次发布吗？"
       reference_topic_title: "回复：%{title}"
       error:
         title_missing: "标题为必填项"
@@ -1902,7 +1902,7 @@ zh_CN:
           label: "共享草稿"
           desc: "起草一个仅对允许的用户可见的话题"
         toggle_topic_bump:
-          label: "切换话题顶帖"
+          label: "切换话题提升"
           desc: "回复但不更改最新回复日期"
       reload: "重新加载"
       ignore: "忽略"
@@ -2277,7 +2277,7 @@ zh_CN:
       auto_delete:
         title: "自动删除话题"
       auto_bump:
-        title: "自动顶帖"
+        title: "自动提升话题"
       reminder:
         title: "提醒我"
       auto_delete_replies:
@@ -2286,9 +2286,9 @@ zh_CN:
         auto_open: "此话题将在 %{timeLeft}后自动开启。"
         auto_close: "此话题将在 %{timeLeft}后自动关闭。"
         auto_publish_to_category: "此话题将在 %{timeLeft}后发布到<a href=%{categoryUrl}>#%{categoryName}</a>。"
-        auto_close_after_last_post: "此话题将在最后一个帖子的%{duration}后关闭。"
+        auto_close_after_last_post: "此话题将在最后一个回复的%{duration}后关闭。"
         auto_delete: "此话题将在 %{timeLeft}后自动删除。"
-        auto_bump: "此话题将在 %{timeLeft}后自动顶帖。"
+        auto_bump: "此话题将在 %{timeLeft}后自动提升。"
         auto_reminder: "您将在 %{timeLeft}后收到此话题的提醒。"
         auto_delete_replies: "此话题的回复会在%{duration}后自动删除。"
       auto_close_title: "自动关闭设置"
@@ -2379,11 +2379,11 @@ zh_CN:
         reset_read: "重置阅读数据"
         make_public: "设为公开话题"
         make_private: "设为个人消息"
-        reset_bump_date: "重置顶帖日期"
+        reset_bump_date: "重置提升日期"
       feature:
         pin: "置顶话题"
         unpin: "取消置顶话题"
-        pin_globally: "全局置顶话题"
+        pin_globally: "全站置顶话题"
         make_banner: "设为横幅话题"
         remove_banner: "移除横幅话题"
       reply:
@@ -2423,13 +2423,13 @@ zh_CN:
           other: "%{categoryLink}中的当前置顶话题数：<strong class='badge badge-notification unread'>%{count}</strong>"
         pin_globally: "将此话题置于所有话题列表顶部至"
         confirm_pin_globally:
-          other: "您已经有 %{count} 个全局置顶的话题。置顶话题过多可能会困扰新用户和匿名用户。确定要全局置顶另一个话题吗？"
+          other: "您已经有 %{count} 个全站置顶的话题。置顶话题过多可能会困扰新用户和匿名用户。确定要全站置顶另一个话题吗？"
         unpin_globally: "将此话题从所有话题列表顶部移除。"
         unpin_globally_until: "将此话题从所有话题列表顶部移除，或等到<strong>%{until}</strong>。"
         global_pin_note: "用户可以为自己单独取消置顶话题。"
-        not_pinned_globally: "没有全局置顶话题。"
+        not_pinned_globally: "没有全站置顶话题。"
         already_pinned_globally:
-          other: "当前全局置顶的话题数：<strong class='badge badge-notification unread'>%{count}</strong>"
+          other: "当前全站置顶的话题数：<strong class='badge badge-notification unread'>%{count}</strong>"
         make_banner: "将此话题设为在所有页面顶部显示的横幅。"
         remove_banner: "移除在所有页面顶部显示的横幅。"
         banner_note: "用户可以通过关闭话题来关闭横幅。任何时候都只能将一个话题设为横幅。"
@@ -2805,7 +2805,7 @@ zh_CN:
         see: "查看"
         reply: "回复"
         create: "创建"
-        no_groups_selected: "没有群组被授予访问权限；此类别仅对管理员可见。"
+        no_groups_selected: "没有群组被授予访问权限；此类别仅对管理人员可见。"
         everyone_has_access: '此类别是公开的，任何人都可以查看、回复和创建帖子。要限制权限，请移除授予“所有人”组的一个或多个权限。'
         toggle_reply: "切换回复权限"
         toggle_full: "切换创建权限"
@@ -2915,7 +2915,7 @@ zh_CN:
       official_warning: "官方警告"
       delete_spammer: "删除垃圾信息发布者"
       flag_for_review: "加入审核队列"
-      delete_confirm_MF: "您将删除此用户的 {POSTS, plural, one {<b>1</b> 个帖子} other {<b>#</b> 个帖子}}和 {TOPICS, plural, one {<b>#</b> 个话题} other {<b>#</b> 个话题}}，移除他们的帐户，阻止其 IP 地址 <b>{ip_address}</b> 再次注册，同时将其电子邮件地址 <b>{email}</b> 加入永久黑名单。确定此用户是垃圾信息发布者吗？"
+      delete_confirm_MF: "您将删除此用户的 {POSTS, plural, other {<b>#</b> 个帖子}}和 {TOPICS, plural, other {<b>#</b> 个话题}}，移除他们的帐户，禁止其 IP 地址 <b>{ip_address}</b> 再次注册，同时将其电子邮件地址 <b>{email}</b> 加入永久屏蔽名单。确定此用户是垃圾信息发布者吗？"
       yes_delete_spammer: "是，删除垃圾信息发布者"
       ip_address_missing: "（不适用）"
       hidden_email_address: "（已隐藏）"
@@ -2966,8 +2966,8 @@ zh_CN:
         title: "已取消置顶"
         help: "此话题已对您取消置顶；它将以常规顺序显示"
       pinned_globally:
-        title: "已全局置顶"
-        help: "此话题已被全局置顶；它将显示在最新话题列表及其所属类别的顶部"
+        title: "已全站置顶"
+        help: "此话题已被全站置顶；它将显示在最新话题列表及其所属类别的顶部"
       pinned:
         title: "已置顶"
         help: "此话题已对您置顶；它将显示在所属类别的顶部"
@@ -3554,7 +3554,7 @@ zh_CN:
               read: 阅读一个话题或其中的一个帖子。也支持 RSS。
               write: 创建一个新话题或发布到现有话题。
               read_lists: 阅读诸如热门、新、最新等话题列表。也支持 RSS。
-              wordpress: WordPress wp-discussion 插件正常工作所必需。
+              wordpress: WordPress wp-discourse 插件正常工作所必需。
             posts:
               edit: 编辑任意帖子或特定帖子。
             users:
@@ -3909,7 +3909,7 @@ zh_CN:
             title: "输入自定义 CSS，我们接受所有有效的 CSS 和 SCSS 样式"
           header:
             text: "页眉"
-            title: "输入要显示在站点页眉上方的 HTML"
+            title: "输入要显示在站点标头上方的 HTML"
           after_header:
             text: "页眉后"
             title: "输入要显示在所有页面的页眉后的 HTML"
@@ -3975,10 +3975,10 @@ zh_CN:
             description: "导航链接。"
           header_background:
             name: "页眉背景"
-            description: "站点页眉的背景色。"
+            description: "站点标头的背景色。"
           header_primary:
             name: "页眉主要"
-            description: "站点页眉的文本和图标。"
+            description: "站点标头的文本和图标。"
           highlight:
             name: "突出显示"
             description: "页面上突出显示元素的背景色，例如帖子和话题。"
@@ -4174,7 +4174,7 @@ zh_CN:
             post_unlocked: "已解锁帖子"
             check_personal_message: "检查个人消息"
             disabled_second_factor: "禁用双重身份验证"
-            topic_published: "已发布帖子"
+            topic_published: "已发布话题"
             post_approved: "已批准帖子"
             post_rejected: "已拒绝帖子"
             create_badge: "创建徽章"
@@ -4268,7 +4268,7 @@ zh_CN:
         clear_all: 全部清除
         clear_all_confirm: "确定要清除%{action}操作的所有关注词吗？"
         invalid_regex: '关注词“%{word}”是无效的正则表达式。'
-        regex_warning: '<a href="%{basePath}/admin/site_settings/category/all_results?filter=watched%20words%20regular%20expressions%20">关注词是正则表达式</a>，它们不会自动包含词边界。如果您希望正则表达式匹配整个词，请在正则表达式的开头和结尾包含 <code>\b</code>'
+        regex_warning: '<a href="%{basePath}/admin/site_settings/category/all_results?filter=watched%20words%20regular%20expressions%20">关注词是正则表达式</a>，它们不会自动包含词边界。如果您希望正则表达式匹配整个字词，请在正则表达式的开头和结尾包含 <code>\b</code>'
         actions:
           block: "禁止"
           censor: "审查"
@@ -4281,11 +4281,11 @@ zh_CN:
         action_descriptions:
           block: "禁止发布包含这些字词的帖子。用户在尝试提交帖子时会看到一条错误消息。"
           censor: "允许包含这些字词的帖子，但将其替换为隐藏敏感词的字符。"
-          require_approval: "包含这些字词的帖子需通过人工批准才能被看到。"
+          require_approval: "包含这些字词的帖子需通过管理人员批准才能被看到。"
           flag: "允许包含这些字词的帖子，但将其举报为不当，以便版主对其进行审核。"
           replace: "使用其他字词替换帖子中的字词"
           tag: "根据第一个帖子自动为话题添加标签"
-          silence: "用户包含这些字词的第一个帖子需要工作人员批准才能被看到，该用户将被自动禁言。"
+          silence: "用户包含这些字词的第一个帖子需要管理人员批准才能被看到，该用户将被自动禁言。"
           link: "使用链接替换帖子中的字词"
         form:
           label: "包含字词或短语"
@@ -4392,7 +4392,7 @@ zh_CN:
         clear_penalty_history:
           title: "清除处罚历史记录"
           description: "有处罚的用户无法达到信任级别 3"
-        delete_all_posts_confirm_MF: "您将删除 {POSTS, plural, one {1 个帖子} other {# 个帖子}}和 {TOPICS, plural, one {1 个话题} other {# 个话题}}。确定吗？"
+        delete_all_posts_confirm_MF: "您将删除 {POSTS, plural, other {# 个帖子}}和 {TOPICS, plural, other {# 个话题}}。确定吗？"
         silence: "禁言"
         unsilence: "取消禁言"
         silenced: "已禁言？"
@@ -4549,7 +4549,7 @@ zh_CN:
           will_be_demoted: "很快会被降级。"
           on_grace_period: "目前在升级宽限期，不会被降级。"
           locked_will_not_be_promoted: "信任级别被锁定。将不再被提升。"
-          locked_will_not_be_demoted: "信任等级被锁定。将不再被降级。"
+          locked_will_not_be_demoted: "信任级别被锁定。将不再被降级。"
         discourse_connect:
           title: "DiscourseConnect 单点登录"
           external_id: "外部 ID"
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index 5615fbe3b2..4a36acf73b 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -57,6 +57,7 @@ ar:
   themes:
     bad_color_scheme: "يتعذَّر تحديث السمة، لوحة الألوان غير صالحة"
     other_error: "حدث خطأ ما في أثناء تحديث السمة"
+    ember_selector_error: "عذرًا - غير مسموح باستخدام #ember أو محدِّدات CSS ember-view لأن هذه الأسماء يتم إنشاؤها ديناميكيًا في وقت التشغيل وستتغير بمرور الوقت، مما يؤدي في النهاية إلى تعطُّل CSS. جرِّب محدِّدًا مختلفًا."
     compile_error:
       unrecognized_extension: "امتداد الملف غير معروف: %{extension}"
     import_error:
@@ -65,14 +66,17 @@ ar:
       about_json_values: "يتضمَّن ملف about.json قيمًا غير صالحة: %{errors}"
       modifier_values: "تتضمَّن معدِّلات ملف about.json قيمًا غير صالحة: %{errors}"
       git: "حدث خطأ في أثناء استنساخ مستودع Git، تم رفض الوصول أو لم يتم العثور على المستودع"
+      git_ref_not_found: "يتعذَّر التحقُّق من مرجع Git:%{ref}"
       unpack_failed: "فشل إلغاء ضغط الملف"
       file_too_big: "الملف غير المضغوط كبير جدًا."
       unknown_file_type: "يبدو أن الملف الذي حمَّلته ليس سمة Discourse صالحة."
+      not_allowed_theme: "`%{repo}` غير مُدرَج في قائمة السمات المسموح بها (ضع علامة في مربع الإعداد العام `allowed_theme_repos`)."
     errors:
       component_no_user_selectable: "لا يمكن أن تكون مكونات السمة قابلة للتحديد بواسطة المستخدم"
       component_no_default: "لا يمكن أن تكون مكونات السمة تابعة للسمة الافتراضية"
       component_no_color_scheme: "لا يمكن أن تحتوي مكونات السمة على لوحات الألوان"
       no_multilevels_components: "لا يمكن أن تكون السمات ذات السمات الفرعية سمات فرعية في حد ذاتها"
+      optimized_link: روابط الصور المحسَّنة سريعة الزوال ولا يجب تضمينها في الرمز البرمجي المصدري للسمة.
     settings_errors:
       invalid_yaml: "ملف YAML الذي أدخلته غير صالح."
       data_type_not_a_number: "نوع الإعداد `%{name}` غير مدعوم. الأنواع المدعومة هي: `integer`، و`bool`، و`list`، و`enum` و`upload`"
@@ -86,9 +90,11 @@ ar:
       number_value_not_valid_min: "يجب أن تكون أكبر من أو تساوي %{min}."
       number_value_not_valid_max: "يجب أن تكون أصغر من أو تساوي %{max}."
       string_value_not_valid: "لا يقع طول القيمة الجديدة ضمن النطاق المسموح به."
+      string_value_not_valid_min_max: "يجب أن يتراوح الطول بين%{min} و%{max} حرف."
       string_value_not_valid_min: "يجب ألا يقل طولها عن %{min} على الأقل."
       string_value_not_valid_max: "يجب أن يزيد عدد حروفها عن %{max} على الأكثر."
     locale_errors:
+      top_level_locale: "يجب أن يتطابق مفتاح المستوى الأعلى في ملف اللغة مع اسم اللغة"
       invalid_yaml: "ملف YAML للترجمة غير صالح"
   emails:
     incoming:
@@ -97,11 +103,24 @@ ar:
       maximum_staged_user_per_email_reached: "لقد بلغت أقصى عدد من المستخدمين المؤقتين الذين يمكن إنشاؤهم لكل بريد إلكتروني."
       no_subject: "(بلا موضوع)"
       no_body: "(بلا نص)"
+      missing_attachment: "(المرفق %{filename} مفقود)"
+      continuing_old_discussion:
+        zero: "متابعة المناقشة من [%{title}](%{url}) لأنه تم إنشاؤها منذ أكثر من %{count} يوم."
+        one: "متابعة المناقشة من [%{title}](%{url}) لأنه تم إنشاؤها منذ أكثر من يوم واحد (%{count})."
+        two: "متابعة المناقشة من [%{title}](%{url}) لأنه تم إنشاؤها منذ أكثر من يومَين (%{count})."
+        few: "متابعة المناقشة من [%{title}](%{url}) لأنه تم إنشاؤها منذ أكثر من %{count} أيام."
+        many: "متابعة المناقشة من [%{title}](%{url}) لأنه تم إنشاؤها منذ أكثر من %{count} يومًا."
+        other: "متابعة المناقشة من [%{title}](%{url}) لأنه تم إنشاؤها منذ أكثر من %{count} يوم."
       errors:
         empty_email_error: "يحدث ذلك عندما تكون النسخة الأولية من الرسالة الإلكترونية التي استلمناها خالية."
         no_message_id_error: "يحدث ذلك عندما لا تحتوي الرسالة الإلكترونية على الرأس 'Message-Id'."
+        auto_generated_email_error: "يحدث ذلك عند ضبط رأس \"الأولوية\" على: قائمة، أو رسالة غير مرغوب فيها أو مجمَّعة، أو رد تلقائي، أو عندما يحتوي أي رأس آخر على: \"مُرسَلة تلقائيًا\"، أو \"رد تلقائي\"، أو \"منشأة تلقائيًا\"."
         no_body_detected_error: "يحدث ذلك عندما يتعذَّر علينا استخراج نص ولا توجد مرفقات."
+        no_sender_detected_error: "يحدث ذلك عندما لا نتمكن من العثور على عنوان بريد إلكتروني صالح في الرأس \"من\"."
+        from_reply_by_address_error: "يحدث عندما يتطابق الرأس \"من\" مع عنوان البريد الإلكتروني في \"رد بواسطة\"."
         inactive_user_error: "يحدث ذلك عندما يكون المُرسِل غير نشط."
+        silenced_user_error: "يحدث ذلك عند كتم المُرسِل."
+        bad_destination_address: "يحدث ذلك عندما لا يتطابق أي من عناوين البريد الإلكتروني الموجودة في الحقول \"إلى\"/\"نسخة إلى\" مع عنوان البريد الإلكتروني الوارد الذي تم إعداده."
         strangers_not_allowed_error: "يحدث ذلك عندما يحاول مستخدم إنشاء موضوع جديد في فئة ليس عضوًا فيها."
         insufficient_trust_level_error: "يحدث ذلك عندما يحاول العضو إنشاء موضوع جديد في فئة لا يملك مستوى الثقة المطلوب لها."
         reply_user_not_matching_error: "يحدث ذلك عندما يأتي الرد من عنوان بريد إلكتروني مختلف عن العنوان الذي تم إرسال الإشعار إليه."
@@ -109,7 +128,11 @@ ar:
         topic_closed_error: "يحدث ذلك عندما يصل رد على موضوع تم إغلاقه."
         bounced_email_error: "هذه الرسالة الإلكترونية عبارة عن تقرير بارتداد الرسالة."
         screened_email_error: "يحدث ذلك عندما يكون عنوان البريد الإلكتروني للمُرسِل قد تم حجبه بالفعل."
+        unsubscribe_not_allowed: "يحدث ذلك عندما يكون إلغاء الاشتراك عبر البريد الإلكتروني غير مسموح به لهذا المستخدم."
+        email_not_allowed: "يحدث عندما لا يكون عنوان البريد الإلكتروني مُدرَجًا في قائمة السماح أو موجودًا في قائمة الحظر."
       unrecognized_error: "خطأ غير معروف"
+    secure_media_placeholder: "محجوبة: الوسائط الآمنة مفعَّلة في هذا الموقع، قم بزيارة الموضوع أو انقر على \"عرض الوسائط\" لعرض الوسائط المُرفَقة."
+    view_redacted_media: "عرض الوسائط"
   errors: &errors
     format: ! "%{attribute} %{message}"
     messages:
@@ -130,6 +153,9 @@ ar:
       inclusion: غير متضمَّنة في القائمة
       invalid: غير صالحة
       is_invalid: "تبدو غير واضحة، هل هذه الجملة كاملة؟"
+      is_invalid_meaningful: "تبدو غير واضحة، فمعظم الكلمات تتضمَّن الأحرف نفسها مرارًا وتكرارًا؟"
+      is_invalid_unpretentious: "تبدو غير واضحة، فهناك كلمة واحدة أو أكثر طويلة جدًا؟"
+      is_invalid_quiet: "تبدو غير واضحة، هل كنت تقصد إدخالها كلها بأحرف كبيرة؟"
       invalid_timezone: "\"%{tz}\" ليست منطقة زمنية صالحة"
       contains_censored_words: "تتضمَّن الكلمات المحجوبة التالية: %{censored_words}"
       less_than: يجب أن تكون أقل من %{count}
@@ -138,6 +164,16 @@ ar:
       not_an_integer: يجب أن تكون عددًا صحيحًا
       odd: يجب أن تكون عددًا فرديًا
       record_invalid: ! "فشل التحقُّق: %{errors}"
+      max_emojis: "لا يمكن أن تتضمَّن أكثر من %{max_emojis_count} رمز تعبيري"
+      emojis_disabled: "لا يمكن أن تتضمَّن رموزًا تعبيرية"
+      ip_address_already_screened: "تم تضمينه بالفعل في قاعدة موجودة"
+      restrict_dependent_destroy:
+        zero: "لا يمكن حذف السجل بسبب وجود %{record} سجل تابع له"
+        one: "لا يمكن حذف السجل بسبب وجود سجل واحد (%{record}) تابع له"
+        two: "لا يمكن حذف السجل بسبب وجود سجلَّين (%{record}) تابعَين له"
+        few: "لا يمكن حذف السجل بسبب وجود %{record} سجلات تابعة له"
+        many: "لا يمكن حذف السجل بسبب وجود %{record} سجلًا تابعًا له"
+        other: "لا يمكن حذف السجل بسبب وجود %{record} سجل تابع له"
       too_long:
         zero: 'طويلة جدًا (الحد الأقصى: %{count} حرف)'
         one: 'طويلة جدًا (الحد الأقصى: حرف واحد (%{count}))'
@@ -160,6 +196,7 @@ ar:
         many: الطول غير صحيح (يجب أن تكون %{count} حرفًا)
         other: الطول غير صحيح (يجب أن تكون %{count} حرف)
       other_than: "يجب أن تكون غير %{count}"
+      auth_overrides_username: "يجب تحديث اسم المستخدم من جانب موفِّر المصادقة؛ إذ إن إعداد `auth_overrides_username` مفعَّل."
     template:
       body: ! "حدثت مشاكل في الحقول التالية:"
       header:
@@ -173,31 +210,110 @@ ar:
       load_from_remote: "حدث خطأ في أثناء تحميل هذا المنشور."
     site_settings:
       invalid_category_id: "الفئة التي حدَّدتها غير موجودة"
+      invalid_choice:
+        zero: "لقد حدَّدت الخيارات غير الصالحة %{name}"
+        one: "لقد حدَّدت الخيار غير الصالح %{name}"
+        two: "لقد حدَّدت الخيارَين غير الصالحَين %{name}"
+        few: "لقد حدَّدت الخيارات غير الصالحة %{name}"
+        many: "لقد حدَّدت الخيارات غير الصالحة %{name}"
+        other: "لقد حدَّدت الخيارات غير الصالحة %{name}"
       default_categories_already_selected: "لا يمكنك تحديد فئة مُستخدَمة في قائمة أخرى."
       default_tags_already_selected: "لا يمكنك تحديد وسم مُستخدَم في قائمة أخرى."
       s3_upload_bucket_is_required: "لا يمكنك تفعيل التحميلات إلى S3 قبل تقديم 's3_upload_bucket'."
+      enable_s3_uploads_is_required: "لا يمكنك تفعيل التخزين في S3 قبل تفعيل تحميلات S3."
+      page_publishing_requirements: "لا يمكن تفعيل نشر الصفحة في حال تفعيل الوسائط الآمنة."
       s3_backup_requires_s3_settings: "لا يمكنك استخدام S3 كمكان للنسخ الاحتياطي ما لم تُدخِل \"%{setting_name}\"."
       s3_bucket_reused: "لا يمكنك استخدام الحاوية نفسها لـ \"s3_upload_bucket\" و\"s3_backup_bucket\" معًا. اختر حاويةً أخرى أو استخدم مسارًا مختلفًا لكل حاوية."
       secure_media_requirements: "يجب تفعيل التحميل إلى S3 قبل تفعيل الوسائط الآمنة."
+      share_quote_facebook_requirements: "يجب عليك ضبط معرِّف تطبيق Facebook لتفعيل مشاركة الاقتباسات على Facebook."
+      second_factor_cannot_enforce_with_socials: "لا يمكنك فرض المصادقة الثنائية عند تفعيل عمليات تسجيل الدخول بحسابات التواصل الاجتماعي. يجب عليك أولًا إيقاف تسجيل الدخول عبر: %{auth_provider_names}"
+      second_factor_cannot_be_enforced_with_disabled_local_login: "لا يمكنك فرض المصادقة الثنائية في حال إيقاف عمليات تسجيل الدخول المحلية."
+      second_factor_cannot_be_enforced_with_discourse_connect_enabled: "لا يمكنك فرض المصادقة الثنائية في حال إيقاف عمليات تسجيل الدخول من خلال DiscourseConnect."
+      local_login_cannot_be_disabled_if_second_factor_enforced: "لا يمكنك إيقاف تسجيل الدخول المحلي في حال فرض المصادقة الثنائية. أوقف المصادقة الثنائية المفروضة قبل إيقاف عمليات تسجيل الدخول المحلية."
+      cannot_enable_s3_uploads_when_s3_enabled_globally: "لا يمكنك تفعيل تحميلات S3 لأن تحميلات S3 مفعَّلة بشكلٍ عام بالفعل، وقد يتسبب تفعيل مستوى الموقع هذا في حدوث مشكلات خطيرة في التحميلات"
+      cors_origins_should_not_have_trailing_slash: "يجب عدم إضافة الشرطة المائلة اللاحقة (/) إلى مصادر CORS."
+    conflicting_google_user_id: 'تم تغيير معرِّف حساب Google لهذا الحساب؛ مطلوب تدخُّل فريق العمل لأسباب أمنية. يُرجى التواصل مع فريق العمل وتوجيهه إلى <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
+    onebox:
+      invalid_address: "عذرًا، لم نتمكن من إنشاء معاينة لصفحة الويب هذه لتعذُّر العثور على الخادم \"%{hostname}\". بدلًا من المعاينة، سيظهر رابط فقط في منشورك. :cry:"
+      error_response: "عذرًا، لم نتمكن من إنشاء معاينة لصفحة الويب هذه لأن خادم الويب عرض رمز الخطأ %{status_code}. بدلًا من المعاينة، سيظهر رابط فقط في منشورك. :cry:"
+      missing_data:
+        zero: "عذرًا، لم نتمكن من إنشاء معاينة لصفحة الويب هذه لتعذُّر العثور على وسوم oEmbed/OpenGraph التالية: %{missing_attributes}"
+        one: "عذرًا، لم نتمكن من إنشاء معاينة لصفحة الويب هذه لتعذُّر العثور على وسم oEmbed/OpenGraph التالي: %{missing_attributes}"
+        two: "عذرًا، لم نتمكن من إنشاء معاينة لصفحة الويب هذه، نظرًا لتعذر العثور على وسمَي oEmbed/OpenGraph التاليَين: %{missing_attributes} %{missing_attributes}"
+        few: "عذرًا، لم نتمكن من إنشاء معاينة لصفحة الويب هذه، نظرًا لتعذر العثور على وسوم oEmbed/OpenGraph التالية: %{missing_attributes} %{missing_attributes}"
+        many: "عذرًا، لم نتمكن من إنشاء معاينة لصفحة الويب هذه، نظرًا لتعذر العثور على وسوم oEmbed/OpenGraph التالية: %{missing_attributes} %{missing_attributes}"
+        other: "عذرًا، لم نتمكن من إنشاء معاينة لصفحة الويب هذه، نظرًا لتعذر العثور على وسوم oEmbed/OpenGraph التالية: %{missing_attributes} %{missing_attributes}"
+  word_connector:
+    comma: "، "
   invite:
+    expired: "انتهت صلاحية رمز الدعوة الخاص بك. يُرجى <a href='%{base_url}/about'>التواصل مع فريق العمل</a>."
+    not_found: "رمز الدعوة الخاص بك غير صالح. يُرجى <a href='%{base_url}/about'>التواصل مع فريق العمل</a>."
+    not_found_json: "رمز الدعوة الخاص بك غير صالح. يُرجى التواصل مع فريق العمل."
+    not_matching_email: "عنوان بريدك الإلكتروني وعنوان بريدك الإلكتروني المرتبط برمز الدعوة غير متطابقَين. يُرجى التواصل مع فريق العمل."
+    not_found_template: |
+      <p>تم بالفعل استرداد دعوتك إلى <a href="%{base_url}">%{site_name}</a> has already been redeemed.</p>
+
+      <p>إذا كنت تتذكر كلمة مرورك، يمكنك <a href="%{base_url}/login">تسجيل الدخول</a>.</p>
+
+      <p>بخلاف ذلك، يُرجى <a href="%{base_url}/password-reset">إعادة ضبط كلمة المرور</a>.</p>
+    not_found_template_link: |
+      <p> لم يعُد من الممكن استرداد الدعوة الموجهة إلى <a href="%{base_url}">%{site_name}</a>. يُرجى مطالبة مالشخص الذي أرسل إليك الدعوة بإرسال دعوة جديدة.</p>
+    user_exists: "ليست هناك حاجة لدعوة <b>%{email}</b>، <a href='%{base_path}/u/%{username}/summary'>فلديه حساب بالفعل!</a>"
+    invite_exists: "لقد أرسلت بالفعل دعوة إلى <b>%{email}</b>."
+    invalid_email: "%{email} ليس عنوان بريد إلكتروني صالحًا."
+    rate_limit:
+      zero: "لقد أرسلت بالفعل %{count} دعوة في اليوم الماضي، يُرجى الانتظار %{time_left} قبل إعادة المحاولة."
+      one: "لقد أرسلت بالفعل دعوة واحدة (%{count}) في اليوم الماضي، يُرجى الانتظار %{time_left} قبل إعادة المحاولة."
+      two: "لقد أرسلت بالفعل دعوتَين (%{count}) في اليوم الماضي، يُرجى الانتظار %{time_left} قبل إعادة المحاولة."
+      few: "لقد أرسلت بالفعل %{count} دعوات في اليوم الماضي، يُرجى الانتظار %{time_left} قبل إعادة المحاولة."
+      many: "لقد أرسلت بالفعل %{count} دعوة في اليوم الماضي، يُرجى الانتظار %{time_left} قبل إعادة المحاولة."
+      other: "لقد أرسلت بالفعل %{count} دعوة في اليوم الماضي، يُرجى الانتظار %{time_left} قبل إعادة المحاولة."
+    confirm_email: "<p>أنت على وشك الانتهاء! لقد أرسلنا رسالة إلكترونية للتفعيل إلى عنوان بريدك الإلكتروني. يُرجى اتباع التعليمات الواردة في الرسالة لتنشيط حسابك.</p><p>إذا لم تصلك الرسالة، فتحقَّق من مجلد الرسائل غير المرغوب فيها.</p>"
+    cant_invite_to_group: "غير مسموح لك بدعوة المستخدمين إلى مجموعة (مجموعات) محدَّدة. تأكَّد من أنك مالك المجموعة (المجموعات) التي تحاول الدعوة إليها."
     disabled_errors:
+      discourse_connect_enabled: "الدعوات متوقفة لأنه تم تفعيل DiscourseConnect."
       invalid_access: "غير مسموح لك بعرض المورد المطلوب."
+    requires_groups: "تم حفظ الدعوة. لمنح إذن الوصول إلى الموضوع المحدَّد، أضِف إحدى المجموعات التالية: %{groups}."
   bulk_invite:
     file_should_be_csv: "يجب أن يكون الملف الذي تم تحميله بتنسيق CSV."
+    max_rows: "تم إرسال أول %{max_bulk_invites} دعوة. حاول تقسيم الملف إلى أجزاء أصغر."
     error: "حدث خطأ في أثناء تحميل هذا الملف. يُرجى إعادة المحاولة لاحقًا."
+  invite_link:
+    email_taken: "عنوان البريد الإلكتروني هذا مُستخدَم بالفعل. إذا كان لديك حساب بالفعل، يُرجى تسجيل الدخول أو إعادة ضبط كلمة المرور."
+    max_redemptions_limit: "يجب أن يكون بين 2 و%{max_limit}."
   topic_invite:
+    failed_to_invite: "لا يمكن دعوة المستخدم إلى هذا الموضوع دون عضوية في إحدى المجموعات التالية: %{group_names}."
     user_exists: "عذرًا، لقد تمت دعوة هذا المستخدم بالفعل. لا يمكنك دعوة مستخدام إلى موضوع أكثر من مرة."
+    muted_invitee: "عذرًا، لقد كتمك هذا المستخدم."
+    muted_topic: "عذرًا، لقد كتم هذا المستخدم ذلك الموضوع."
+    receiver_does_not_allow_pm: "عذرًا، لا يسمح لك هذا المستخدم بإرسال رسائل خاصة إليه."
+    sender_does_not_allow_pm: "عذرًا، أنت لا تسمح لهذا المستخدم بإرسال رسائل خاصة إليك."
+    user_cannot_see_topic: "%{username} لا يمكنه رؤية الموضوع."
   backup:
     operation_already_running: "توجد عملية جارية حاليًا. لا يمكنك بدء مهمة جديدة الآن."
     backup_file_should_be_tar_gz: "يجب أن يكون الملف الاحتياطي عبارة عن أرشيف بالامتداد .tar.gz"
     not_enough_space_on_disk: "لا تتوفَّر مساحة كافية على القرص لتحميل هذه النسخة الاحتياطية."
     invalid_filename: "يحتوي اسم ملف النسخة الاحتياطية على حروف غير صالحة. الحروف الصالحة هي a-z 0-9 .-_."
+    file_exists: "الملف الذي تحاول تحميله موجود بالفعل."
+  invalid_params: "لقد قدَّمت معلمات غير صالحة للطلب: %{message}"
   not_logged_in: "عليك تسجيل الدخول لإجراء ذلك."
   not_found: "تعذَّر العثور على عنوان URL أو المورد المطلوب."
   invalid_access: "غير مسموح لك بعرض المورد المطلوب."
+  authenticator_not_found: "طريقة المصادقة غير موجودة، أو تم إيقافها."
+  invalid_api_credentials: "غير مسموح لك بعرض الموارد المطلوبة. اسم مستخدم API أو المفتاح غير صالح."
+  provider_not_enabled: "غير مسموح لك بعرض المورد المطلوب. موفِّر المصادقة غير مفعَّل."
+  provider_not_found: "غير مسموح لك بعرض المورد المطلوب. موفِّر المصادقة غير موجود."
   read_only_mode_enabled: "الموقع في وضع القراءة فقط. والتفاعلات متوقفة."
+  invalid_grant_badge_reason_link: "غير مسموح بوضع رابط Discourse خارجي أو غير صالح في سبب منح الشارة"
+  email_template_cant_be_modified: "لا يمكن تعديل نموذج البريد الإلكتروني هذا"
+  invalid_whisper_access: "إما أن الهمسات غير مفعَّلة أو ليس لديك إذن الوصول لإنشاء منشورات الهمس"
   not_in_group:
+    title_topic: "عليك طلب عضوية في المجموعة \"%{group}\" لرؤية هذا الموضوع."
+    title_category: "عليك طلب عضوية في المجموعة \"%{group}\" لرؤية هذه الفئة."
+    request_membership: "طلب العضوية"
     join_group: "الانضمام إلى المجموعة"
+  deleted_topic: "عذرًا! تم حذف هذا الموضوع ولم يعُد متاحًا."
+  delete_topic_failed: "حدث خطأ في أثناء حذف هذا الموضوع. يُرجى التواصل مع مسؤول الموقع."
   reading_time: "وقت القراءة"
   likes: "الإعجابات"
   too_many_replies:
@@ -207,11 +323,22 @@ ar:
     few: "عذرًا، لا يمكن للمستخدمين الجُدد الرد أكثر من %{count} مرات في الموضوع نفسه، وذلك بشكلٍ مؤقت."
     many: "عذرًا، لا يمكن للمستخدمين الجُدد الرد أكثر من %{count} مرة في الموضوع نفسه، وذلك بشكلٍ مؤقت."
     other: "عذرًا، لا يمكن للمستخدمين الجُدد الرد أكثر من %{count} مرة في الموضوع نفسه، وذلك بشكلٍ مؤقت."
+  max_consecutive_replies:
+    zero: "غير مسموح بأكثر من %{count} رد متتالٍ. يُرجى تعديل ردك السابق، أو الانتظار حتى يرد عليك أحد."
+    one: "غير مسموح بأكثر من رد واحد (%{count}) متتالٍ. يُرجى تعديل ردك السابق، أو الانتظار حتى يرد عليك أحد."
+    two: "غير مسموح بأكثر من ردَّين (%{count}) متتاليَين. يُرجى تعديل ردك السابق، أو الانتظار حتى يرد عليك أحد."
+    few: "غير مسموح بأكثر من %{count} ردود متتالية. يُرجى تعديل ردك السابق، أو الانتظار حتى يرد عليك أحد."
+    many: "غير مسموح بأكثر من %{count} ردًا متتاليًا. يُرجى تعديل ردك السابق، أو الانتظار حتى يرد عليك أحد."
+    other: "غير مسموح بأكثر من %{count} رد متتالٍ. يُرجى تعديل ردك السابق، أو الانتظار حتى يرد عليك أحد."
   embed:
     start_discussion: "بدء المناقشة"
     continue: "متابعة المناقشة"
     error: "خطأ في التضمين"
     referer: "المُحيل:"
+    error_topics: "لم يتم تفعيل إعداد الموقع `embed topics list`"
+    mismatch: "إما أنه لم يتم إرسال المرجع أو أنه لم يتطابق مع أي من المضيفات التالية:"
+    no_hosts: "لم يتم إعداد أي مضيفات للتضمين."
+    configure: "إعداد التضمين"
     more_replies:
       zero: "%{count} رد آخر"
       one: "رد واحد (%{count}) آخر"
@@ -230,6 +357,13 @@ ar:
       few: "%{count} ردود"
       many: "%{count} ردًا"
       other: "%{count} رد"
+    likes:
+      zero: "%{count} إعجاب"
+      one: "إعجاب واحد (%{count})"
+      two: "إعجابان (%{count})"
+      few: "%{count} إعجابات"
+      many: "%{count} إعجابًا"
+      other: "%{count} إعجاب"
     last_reply: "آخر رد"
     created: "تم الإنشاء"
     new_topic: "إنشاء موضوع جديد"
@@ -249,6 +383,15 @@ ar:
     few: "عذرًا، يمكن للمستخدمين الجُدد الإشارة إلى %{count} مستخدمين آخرين فقط في المنشور."
     many: "عذرًا، يمكن للمستخدمين الجُدد الإشارة إلى %{count} مستخدمًا آخر فقط في المنشور."
     other: "عذرًا، يمكن للمستخدمين الجُدد الإشارة إلى %{count} مستخدم آخر فقط في المنشور."
+  no_embedded_media_allowed_trust: "عذرًا، لا يمكنك تضمين عناصر الوسائط في منشور."
+  no_embedded_media_allowed: "عذرًا، لا يمكن للمستخدمين الجُدد تضمين عناصر الوسائط في المنشورات."
+  too_many_embedded_media:
+    zero: "عذرًا، يمكن للمستخدمين الجُدد تضمين %{count} عنصر وسائط فقط في المنشور."
+    one: "عذرًا، يمكن للمستخدمين الجُدد تضمين عنصر وسائط واحد (%{count}) فقط في المنشور."
+    two: "عذرًا، يمكن للمستخدمين الجُدد تضمين عنصرَي (%{count}) وسائط فقط في المنشور."
+    few: "عذرًا، يمكن للمستخدمين الجُدد تضمين %{count} عناصر وسائط فقط في المنشور."
+    many: "عذرًا، يمكن للمستخدمين الجُدد تضمين %{count} عنصر وسائط فقط في المنشور."
+    other: "عذرًا، يمكن للمستخدمين الجُدد تضمين %{count} عنصر وسائط فقط في المنشور."
   no_attachments_allowed: "عذرًا، لا يمكن للأعضاء الجُدد وضع المرفقات في المنشورات."
   too_many_attachments:
     zero: "عذرًا، لا يمكن للأعضاء الجُدد وضع أكثر من %{count} مرفق في المنشور."
@@ -258,6 +401,7 @@ ar:
     many: "عذرًا، لا يمكن للأعضاء الجُدد وضع أكثر من %{count} مرفقًا في المنشور."
     other: "عذرًا، لا يمكن للأعضاء الجُدد وضع أكثر من %{count} مرفق في المنشور."
   no_links_allowed: "عذرًا، لا يمكن للمستخدمين الجُدد وضع روابط في المنشورات."
+  links_require_trust: "عذرًا، لا يمكنك تضمين الروابط في منشوراتك."
   too_many_links:
     zero: "عذرًا، لا يمكن للمستخدمين الجُدد وضع أكثر من %{count} رابط في المنشور."
     one: "عذرًا، لا يمكن للمستخدمين الجُدد وضع أكثر من رابط واحد (%{count}) في المنشور."
@@ -265,10 +409,18 @@ ar:
     few: "عذرًا، لا يمكن للمستخدمين الجُدد وضع أكثر من %{count} روابط في المنشور."
     many: "عذرًا، لا يمكن للمستخدمين الجُدد وضع أكثر من %{count} رابطًا في المنشور."
     other: "عذرًا، لا يمكن للمستخدمين الجُدد وضع أكثر من %{count} رابط في المنشور."
+  contains_blocked_word: "يتضمَّن منشورك كلمة غير مسموح بها: %{word}"
+  contains_blocked_words: "يتضمَّن منشورك عدة كلمات غير مسموح بها: %{word}"
   spamming_host: "عذرًا، لا يمكنك نشر رابط إلى هذا المضيف."
   user_is_suspended: "غير مسموح للمستخدمين المعلَّقين بالنشر."
   topic_not_found: "حدث خطأ. ربما يكون هذا الموضوع قد تم إغلاقه أو حذفه بينما كنت تعرضه؟"
   not_accepting_pms: "عذرًا، لا يقبل %{username} الرسائل في الوقت الحالي."
+  max_pm_recipients: "عذرًا، لا يمكنك إرسال رسالة إلى أكثر من %{recipients_limit} مستلم."
+  pm_reached_recipients_limit: "عذرًا، لا يمكن إضافة أكثر من %{users_limit} مستلم في الرسالة."
+  removed_direct_reply_full_quotes: "تمت إزالة الاقتباس من المنشور السابق بالكامل تلقائيًا."
+  watched_words_auto_tag: "تم وضع وسم على الموضوع تلقائيًا"
+  secure_upload_not_allowed_in_public_topic: "عذرًا، لا يمكن استخدام التحميلات الآمنة التالية في موضوع عام: %{upload_filenames}."
+  create_pm_on_existing_topic: "عذرًا، لا يمكنك إنشاء رسالة خاصة بشأن موضوع حالي."
   slow_mode_enabled: "هذا الموضوع في الوضع البطيء."
   just_posted_that: "مشابه جدًا لما نشرته مؤخرًا"
   invalid_characters: "يتضمَّن حروفًا غير صالحة"
@@ -287,12 +439,26 @@ ar:
     few: "%{count} منشورات"
     many: "%{count} منشورًا"
     other: "%{count} منشور"
+  rss_num_participants:
+    zero: "%{count} مشارك"
+    one: "مشارك واحد (%{count})"
+    two: "مشاركان (%{count})"
+    few: "%{count} مشاركين"
+    many: "%{count} مشاركًا"
+    other: "%{count} مشارك"
   read_full_topic: "قراءة الموضوع بالكامل"
   private_message_abbrev: "رسالة"
   rss_description:
     latest: "آخر الموضوعات"
     top: "الموضوعات الأكثر عرضًا"
+    top_all: "الموضوعات الأكثر عرضًا على الإطلاق"
+    top_yearly: "الموضوعات الأكثر عرضًا سنويًا"
+    top_quarterly: "الموضوعات الأكثر عرضًا كل 3 أشهر"
+    top_monthly: "الموضوعات الأكثر عرضًا شهريًا"
+    top_weekly: "الموضوعات الأكثر عرضًا أسبوعيًا"
+    top_daily: "الموضوعات الأكثر عرضًا يوميًا"
     posts: "آخر المنشورات"
+    private_posts: "آخر الرسائل الخاصة"
     group_posts: "آخر المنشورات من %{group_name}"
     group_mentions: "آخر الإشارات من %{group_name}"
     user_posts: "آخر المنشورات من @%{username}"
@@ -300,9 +466,17 @@ ar:
     tag: "الموضوعات الموسومة"
     badge: "الشارة %{display_name} على %{site_title}"
   too_late_to_edit: "تم إنشاء هذا المنشور منذ فترة طويلة جدًا، ولم يعد من الممكن تعديله أو حذفه."
+  edit_conflict: "تم تعديل هذا المنشور بواسطة مستخدم آخر ولم يعُد من الممكن حفظ تغييراتك."
   revert_version_same: "الإصدار الحالي هو الإصدار نفسه الذي تحاول استرجاعه."
+  cannot_edit_on_slow_mode: "هذا الموضوع في الوضع البطيء. لتشجيع المناقشة عميقة الفكر والمدروسة، فإنه غير مسموح حاليًا بتعديل المنشورات القديمة في هذا الموضوع في أثناء تفعيل الوضع البطيء."
   excerpt_image: "صورة"
   bookmarks:
+    errors:
+      already_bookmarked_post: "لا يمكنك وضع إشارة مرجعية نفس المنشور نفسه مرتَين."
+      too_many: "عذرًا، لا يمكنك إضافة أكثر من %{limit} إشارة مرجعية، انتقل إلى <a href='%{user_bookmarks_url}'>%{user_bookmarks_url}</a> لإزالة بعضها."
+      cannot_set_past_reminder: "لا يمكنك ضبط تذكير بالإشارة المرجعية في الماضي."
+      cannot_set_reminder_in_distant_future: "لا يمكنك ضبط تذكير بالإشارة المرجعية بعد أكثر من 10 أيام في المستقبل."
+      time_must_be_provided: "يجب إدخال الوقت لجميع التذكيرات"
     reminders:
       at_desktop: "في المرة القادمة التي أستخدم فيها كمبيوتر سطح المكتب"
       later_today: "لاحقًا اليوم"
@@ -312,7 +486,16 @@ ar:
       next_month: "الشهر القادم"
       custom: "تاريخ ووقت مخصَّصان"
   groups:
+    success:
+      bulk_add:
+        zero: "تمت إضافة %{count} مستخدم إلى المجموعة."
+        one: "تمت إضافة مستخدم واحد (%{count}) إلى المجموعة."
+        two: "تمت إضافة مستخدمَين (%{count}) إلى المجموعة."
+        few: "تمت إضافة %{count} مستخدمين إلى المجموعة."
+        many: "تمت إضافة %{count} مستخدمًا إلى المجموعة."
+        other: "تمت إضافة %{count} مستخدم إلى المجموعة."
     errors:
+      grant_trust_level_not_valid: "\"%{trust_level}\" ليس مستوى ثقة صالحًا."
       can_not_modify_automatic: "لا يمكنك تعديل مجموعة تلقائية"
       member_already_exist:
         zero: "المستخدم التالي عضو بالفعل في هذه المجموعة: %{username}"
@@ -325,6 +508,18 @@ ar:
       invalid_incoming_email: "'%{email}' ليس عنوان بريد إلكتروني صالحًا."
       email_already_used_in_group: "'%{email}' مُستخدَم بالفعل بواسطة المجموعه '%{group_name}'."
       email_already_used_in_category: "'%{email}' مُستخدَم بالفعل بواسطة الفئة '%{category_name}'."
+      cant_allow_membership_requests: "لا يمكنك السماح بطلبات العضوية لمجموعة دون أي مالكين."
+      already_requested_membership: "لقد طلبت بالفعل عضوية في هذه المجموعة."
+      adding_too_many_users:
+        zero: "يمكن إضافة %{count} مستخدم كحد أقصى دفعة واحدة"
+        one: "يمكن إضافة مستخدم واحد (%{count}) كحد أقصى دفعة واحدة"
+        two: "يمكن إضافة مستخدمَين (%{count}) كحد أقصى دفعة واحدة"
+        few: "يمكن إضافة %{count} مستخدمين كحد أقصى دفعة واحدة"
+        many: "يمكن إضافة %{count} مستخدمًا كحد أقصى دفعة واحدة"
+        other: "يمكن إضافة %{count} مستخدم كحد أقصى دفعة واحدة"
+      usernames_or_emails_required: "يجب أن تكون أسماء المستخدمين أو عناوين البريد الإلكتروني موجودة"
+      no_invites_with_discourse_connect: "يمكنك دعوة المستخدمين المسجَّلين فقط عند تفعيل DiscourseConnect"
+      no_invites_without_local_logins: "يمكنك دعوة المستخدمين المسجَّلين فقط عند تعطيل عمليات تسجيل الدخول المحلية"
     default_names:
       everyone: "الجميع"
       admins: "المسؤولون"
@@ -335,7 +530,10 @@ ar:
       trust_level_2: "trust_level_2"
       trust_level_3: "trust_level_3"
       trust_level_4: "trust_level_4"
+    request_membership_pm:
+      title: "طلب عضوية في @%{group_name}"
     request_accepted_pm:
+      title: "لقد تم قبولك في @%{group_name}"
       body: |
         تم قبول طلبك لدخول ⁨@%{group_name}⁩ وأصبحت الآن عضوًا.
   education:
@@ -346,6 +544,26 @@ ar:
       few: "%{count} منشورات"
       many: "%{count} منشورًا"
       other: "%{count} منشور"
+    "new-topic": |
+      مرحبًا بك في %{site_name} &mdash; **نشكرك على بدء محادثة جديدة!**
+
+      - هل يبدو العنوان مثيرًا للاهتمام إذا قرأته بصوت عالٍ؟ هل هو ملخص جيد؟
+
+      - من سيكون مهتمًا بهه؟ لماذا هو مهم؟ ما نوع الردود التي تريدها؟
+
+      - قم بتضمين الكلمات شائعة الاستخدام في موضوعك حتى يتمكن الآخرون من *العثور* عليه. لتجميع موضوعك مع الموضوعات ذات الصلة، حدِّد فئة (أو وسمًا).
+
+      لمزيد من المعلومات، [راجع إرشادات المجتمع](%{base_path}/guidelines). ستظهر هذه اللوحة في أول %{education_posts_text} فقط.
+    "new-reply": |
+      مرحبًا بك في %{site_name} &mdash; **نشكرك على المساهمة!**
+
+      - كُن لطيفًا مع زملائك من أعضاء المجتمع.
+
+      - هل يساهم ردك في تحسين المحادثة؟
+
+      - نحن نرحِّب بالنقد البنَّاء، ولكن انتقد *الأفكار*، وليس الأشخاص.
+
+      لمزيد من المعلومات، [راجع إرشادات مجتمعنا](%{base_path}/guidelines). ستظهر هذه اللوحة في أول %{education_posts_text} فقط.
     avatar: |
       ### ما رأيك بوضع صورة لحسابك؟
 
@@ -362,12 +580,27 @@ ar:
       يمكنك التعديل على ردك السابق لإضافة اقتباس عن طريق تمييز النص والضغط على زر <b>اقتباس الرد</b> الذي يظهر.
 
       يسهُل على الجميع قراءة الموضوعات التي يوجد بها عدد قليل من الردود التفصيلية بدلًا من الكثير من الردود الفردية الصغيرة.
+    dominating_topic: "### دع الآخرين ينضمون إلى المحادثة\n\nمن الواضح أن هذا الموضوع مهم بالنسبة لك &ndash؛ لقد نشرت أكثر من %{percent}% من الردود هنا.\n\nقد يكون من الأفضل أيضًا أن تمنح الآخرين مساحة لمشاركة وجهات نظرهم أيضًا. هل يمكنك دعوتهم؟"
+    get_a_room: |
+      ### شجِّع الجميع على المشاركة في المحادثة
+
+      لقد رددت %{count} مرة على @%{reply_username} في هذا الموضوع بالتحديد!
+
+      تتضمَّن المناقشة الرائعة العديد من الأصوات ووجهات نظر. هل يمكنك إشراك أي شخص آخر؟
+
+      ولا تنسَ، إذا كنت ترغب في مواصلة محادثتك مع هذا المستخدم المحدَّد بعيدًا عن الرأي العام، [فأرسل إليه رسالة خاصة](%{base_path}/u/%{reply_username}).
     too_many_replies: |
       ### لقد بلغت حد الردود في هذا الموضوع
 
       عذرًا، لا يمكن للمستخدمين الجُدد الرد أكثر من %{newuser_max_replies_per_topic} مرة في الموضوع نفسه، وذلك بشكلٍ مؤقت.
 
       بدلًا من إضافة رد آخر، يُرجى النظر في تعديل الردود السابقة، أو زيارة موضوعات أخرى.
+    reviving_old_topic: |
+      ### إحياء هذا الموضوع؟
+
+      لقد كان الرد الأخير على هذا الموضوع منذ **%{time_ago}**. سيؤدي ردك إلى رفع الموضوع إلى أعلى قائمته وإرسال إشعار إلى أي شخص شارك سابقًا في المحادثة.
+
+      هل تريد بالتأكيد متابعة هذه المحادثة القديمة؟
   activerecord:
     attributes:
       category:
@@ -385,10 +618,17 @@ ar:
         topic:
           attributes:
             base:
+              warning_requires_pm: "يمكنك إرفاق التحذيرات بالرسائل الخاصة فقط."
               too_many_users: "يمكنك إرسال التحذيرات إلى مستخدم واحد فقط في الوقت نفسه."
+              cant_send_pm: "عذرًا، لا يمكنك إرسال رسالة خاصة إلى هذا المستخدم."
               no_user_selected: "يجب عليك تحديد مستخدم صالح."
               reply_by_email_disabled: "تم إيقاف الرد عبر البريد الإلكتروني."
+              send_to_email_disabled: "عذرًا، لا يمكنك إرسال رسالة خاصة إلى هذا البريد الإلكتروني."
+              target_user_not_found: "تعذَّر العثور على أحد المستخدمين الذين تُرسل إليهم هذه الرسالة."
+              unable_to_update: "حدث خطأ في أثناء تحديث هذا الموضوع."
+              unable_to_tag: "حدث خطأ في أثناء وضع وسم على الموضوع."
             featured_link:
+              invalid: "غير صالح. يجب أن يتضمَّن عنوان URL http:// أو https://."
               invalid_category: "لا يمكن التعديل في هذه الفئة."
         user:
           attributes:
@@ -397,8 +637,22 @@ ar:
               same_as_username: "هي نفس اسم المستخدم. يُرجى استخدام كلمة مرور أكثر أمانًا."
               same_as_email: "هي نفس عنوان بريدك الإلكتروني. يُرجى استخدام كلمة مرور أكثر أمانًا."
               same_as_current: "هي نفس كلمة مرورك الحالية"
+              same_as_name: "مطابق لاسمك."
+              unique_characters: "تتضمَّن عددًا كبيرًا جدًا من الأحرف المتكررة. يُرجى استخدام كلمة مرور أكثر أمانًا."
+            username:
+              same_as_password: "مطابقة لكلمة مرورك."
+            name:
+              same_as_password: "مطابقة لكلمة مرورك."
             ip_address:
               signup_not_allowed: "الاشتراك غير مسموح به من هذا الحساب."
+        user_profile:
+          attributes:
+            featured_topic_id:
+              invalid: "لا يمكن عرض هذا الموضوع في ملفك الشخصي."
+        user_email:
+          attributes:
+            user_id:
+              reassigning_primary_email: "غير مسموح بإعادة تخصيص عنوان البريد الإلكتروني الأساسي إلى مستخدم آخر."
         color_scheme_color:
           attributes:
             hex:
@@ -410,7 +664,29 @@ ar:
           attributes:
             payload_url:
               invalid: "عنوان URL صالح. يجب أن يحتوي الرابط على http:// أو https://. وغير مسموح بالمسافات الخالية."
+        custom_emoji:
+          attributes:
+            name:
+              taken: قيد الاستخدام بواسطة رمز تعبيري آخر
+        topic_timer:
+          attributes:
+            execute_at:
+              in_the_past: "يجب أن تكون في المستقبل."
+            duration_minutes:
+              cannot_be_zero: "يجب أن تكون أكبر من 0."
+              exceeds_maximum: "لا يمكن أن يتجاوز 20 سنة."
+        translation_overrides:
+          attributes:
+            value:
+              invalid_interpolation_keys: 'مفتاح (مفاتيح) الاستكمال التالي غير صالح: "%{keys}"'
+        watched_word:
+          attributes:
+            word:
+              too_many: "الكثير من الكلمات لهذا الإجراء"
+            base:
+              invalid_url: "عنوان URL البديل غير صالح"
       <<: *errors
+  uncategorized_category_name: "غير مصنَّف"
   vip_category_name: "الاستراحة"
   vip_category_description: "فئة حصرية للأعضاء من مستوى الثقة 3 وأعلى."
   meta_category_name: "التعليقات على الموقع"
@@ -419,12 +695,50 @@ ar:
   staff_category_description: "فئة خاصة لمناقشات فريق العمل. تكون الموضوعات مرئية للمسؤولين والمشرفين فقط."
   discourse_welcome_topic:
     title: "مرحبًا بك في Discourse"
+    body: |2
+
+      ستكون الفقرة الأولى من هذا الموضوع المثبَّت مرئية كرسالة ترحيب لجميع الزوار الجُدد على صفحتك الرئيسية. إنه مهم!
+
+      **عدِّل هذا** إلى وصف موجز لمجتمعك:
+
+      - لمن هو؟
+      - ما الذي يمكنهم العثور عليه هنا؟
+      - لماذا يجب أن يأتوا إلى هنا؟
+      - أين يمكنهم قراءة المزيد (الروابط، الموارد، إلخ)؟
+
+      <img src="%{base_path}/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+
+      قد ترغب في إغلاق هذا الموضوع من خلال المسؤول :wrench: (في أعلى اليمين والأسفل)؛ حتى لا تتراكم الردود في إعلان.
   lounge_welcome:
     title: "مرحبًا بك في الاستراحة"
+    body: |2
+
+      تهانينا! :confetti_ball:
+
+      إذا كان بإمكانك رؤية هذا الموضوع، فقد تمت ترقيتك مؤخرًا إلى **منتظم** (مستوى الثقة 3).
+
+      يمكنك الآن & hellip؛
+
+      * تعديل عنوان أي موضوع
+      * تغيير فئة أي موضوع
+      * تتبُع جميع روابطك - تتم إزالة ([إلغاء المتابعة التلقائي](https://en.wikipedia.org/wiki/Nofollow)
+      * الوصول إلى فئة استراحة خاصة مرئية فقط للمستخدمين من مستوى الثقة 3 وأعلى
+      * إخفاء المنشورات غير المرغوب فيها ببلاغ واحد
+
+      إليك [القائمة الحالية بزملائك من المستخدمين المنتظمين](%{base_path}/badges/3/regular). لا تنسَ إلقاء التحية.
+
+      نشكرك على كونك جزءًا مهمًا من هذا المجتمع!
+
+      (لمزيد من المعلومات بشأن مستويات الثقة، [راجع هذا الموضوع][الثقة]. يُرجى العلم بأن الأعضاء الذين يستمرون في استيفاء المتطلبات بمرور الوقت سيظلون منتظمين.)
+
+      [الثقة]: https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/
+  admin_quick_start_title: "اقرأني أولًا: دليل البدء السريع للمسؤولين"
   category:
     topic_prefix: "نبذة عن الفئة %{category}"
+    replace_paragraph: "(استبدل هذه الفقرة الأولى بوصف موجز لفئتك الجديدة. سيظهر هذا التوجيه في منطقة تحديد الفئة؛ لذا حاول جعلها أقل من 200 حرف.)"
     post_template: "%{replace_paragraph}\n\nاستخدام الفقرات التالية لوضع وصف أطول، أو لوضع إرشادات أو قواعد الفئة:\n\n- لماذا قد يستخدم الأشخاص هذه الفئة؟ ما الغرض منها؟\n\n- ما الاختلاف بين هذه الفئة و الفئات الأخرى لدينا؟\n\n- ما الذي يمكن أن تتضمَّنه الموضوعات في هذه الفئة بشكلٍ عام؟\n\n- هل نحتاج حقًا إلى هذه الفئة؟ وهل يمكننا دمجها مع فئة أو فئة فرعية أخرى؟\n"
     errors:
+      not_found: "لم يتم العثور على الفئة!"
       uncategorized_parent: "لا يمكن للفئات غير المصنَّفة أن يكون لها فئة رئيسية"
       self_parent: "لا يمكن أن تكون الفئة الرئيسية للفئة الفرعية هي الفئة الفرعية نفسها"
       depth: "لا يمكنك وضع فئة فرعية تحت أخرى"
@@ -432,15 +746,53 @@ ar:
       email_already_used_in_group: "'%{email}' مُستخدَم بالفعل بواسطة المجموعه '%{group_name}'."
       email_already_used_in_category: "'%{email}' مُستخدَم بالفعل بواسطة الفئة '%{category_name}'."
       description_incomplete: "يجب أن يتضمَّن منشور وصف الفئة فقرة واحدة على الأقل."
+      permission_conflict: "يجب أيضًا السماح لأي مجموعة مسموح لها بالوصول إلى فئة فرعية بالوصول إلى الفئة الرئيسية. المجموعات التالية لديها إذن بالوصول إلى إحدى الفئات الفرعية، ولكن ليس لديها  إذن بالوصول إلى الفئة الرئيسية: %{group_names}."
+      disallowed_topic_tags: "يتضمَّن هذا الموضوع وسومًا لا تسمح بها هذه الفئة: \"%{tags}\""
+      disallowed_tags_generic: "يتضمَّن الموضوع وسومًا غير مسموح بها."
     cannot_delete:
+      uncategorized: "هذه الفئة خاصة. والغرض منها هو أن تكون منطقة للاحتفاظ بالموضوعات التي ليس لها فئة؛ لا يمكن حذفها."
       has_subcategories: "لا يمكن حذف هذه الفئة لأنها تتضمَّن فئات فرعية."
+      topic_exists:
+        zero: "لا يمكن حذف هذه الفئة لأنها تحتوي على %{count} موضوع. أقدم موضوع هو %{topic_link}."
+        one: "لا يمكن حذف هذه الفئة لأنها تحتوي على موضوع واحد (%{count}). أقدم موضوع هو %{topic_link}."
+        two: "لا يمكن حذف هذه الفئة لأنها تحتوي على موضوعَين (%{count}). أقدم موضوع هو %{topic_link}."
+        few: "لا يمكن حذف هذه الفئة لأنها تحتوي على %{count} موضوعات. أقدم موضوع هو %{topic_link}."
+        many: "لا يمكن حذف هذه الفئة لأنها تحتوي على %{count} موضوعًا. أقدم موضوع هو %{topic_link}."
+        other: "لا يمكن حذف هذه الفئة لأنها تحتوي على %{count} موضوع. أقدم موضوع هو %{topic_link}."
       topic_exists_no_oldest: "لا يمكن حذف هذه الفئة لأن عدد الموضوعات هو %{count}."
     uncategorized_description: "الموضوعات التي لا تحتاج إلي فئة أو لا تندرج تحت أي فئة أخرى."
   trust_levels:
     admin: "المسؤول"
     staff: "فريق العمل"
     change_failed_explanation: "لقد حاولت خفض رتبة %{user_name} إلى '%{new_trust_level}'، لكن مستوى الثقة لديه حاليًا هو '%{current_trust_level}'. سيظل %{user_name} عند مستوى الثقة '%{current_trust_level}' - إذا كنت ترغب في خفض رتبة المستخدم، فاقفل مستوى الثقة أولًا."
+  post:
+    image_placeholder:
+      broken: "هذه الصورة تالفة"
+    has_likes:
+      zero: "%{count} إعجاب"
+      one: "إعجاب واحد (%{count})"
+      two: "إعجابَين (%{count})"
+      few: "%{count} إعجابات"
+      many: "%{count} إعجابًا"
+      other: "%{count} إعجاب"
   rate_limiter:
+    slow_down: "لقد نفَّذت هذا الإجراء عدة مرات، يُرجى إعادة المحاولة في وقت لاحق."
+    too_many_requests: "لقد نفَّذت هذا الإجراء عدة مرات. يُرجى الانتظار %{time_left} قبل إعادة المحاولة."
+    by_type:
+      first_day_replies_per_day: "إننا نقدَّر حماسك، استمر في ذلك! ومع ذلك، من أجل سلامة مجتمعنا، فقد وصلت إلى الحد الأقصى لعدد الردود التي يمكن للمستخدم الجديد إنشاؤها في يومه الأول. يُرجى الانتظار %{time_left} وستتمكن من إنشاء المزيد من الردود."
+      first_day_topics_per_day: "إننا نقدَّر حماسك، استمر في ذلك! ومع ذلك، من أجل سلامة مجتمعنا، فقد وصلت إلى الحد الأقصى لعدد الموضوعات التي يمكن للمستخدم الجديد إنشاؤها في يومه الأول. يُرجى الانتظار %{time_left} وستتمكن من إنشاء المزيد من الموضوعات الجديدة."
+      create_topic: "أنت تنشئ الموضوعات بسرعة كبيرة جدًا. يُرجى الانتظار %{time_left} قبل إعادة المحاولة."
+      create_post: "أنت ترد بسرعة كبيرة جدًا. يُرجى الانتظار %{time_left} قبل إعادة المحاولة."
+      delete_post: "أنت تحذف المنشورات بسرعة كبيرة جدًا. يُرجى الانتظار% {time_left} قبل إعادة المحاولة."
+      public_group_membership: "أنت تنضم إلى/تغادر المجموعات كثيرًا جدًا. يُرجى الانتظار %{time_left} قبل إعادة المحاولة."
+      topics_per_day: "لقد وصلت إلى الحد الأقصى من الموضوعات الجديدة المسموح بها يوميًا. يمكنك إنشاء المزيد من الموضوعات الجديدة بعد %{time_left}."
+      pms_per_day: "لقد وصلت إلى الحد الأقصى للرسائل المسموح بها يوميًا. يمكنك إنشاء المزيد من الرسائل الجديدة بعد %{time_left}."
+      create_like: "رائع! لقد كنت تشارك الكثير من الحب! لقد وصلت إلى الحد الأقصى من الإعجابات اليومية لهذا اليوم، ولكن كلما زادت مستويات الثقة لديك، زاد عدد الإعجابات اليومية. ستتمكن من تسجيل الإعجاب بالمنشورات مرة أخرى بعد %{time_left}."
+      create_bookmark: "لقد وصلت إلى الحد الأقصى من عدد الإشارات المرجعية اليومية. يمكنك إنشاء المزيد من الإشارات المرجعية بعد %{time_left}."
+      edit_post: "لقد وصلت إلى الحد الأقصى من عدد التعديلات اليومية. يمكنك إجراء المزيد من التعديلات بعد %{time_left}."
+      live_post_counts: "أنت تطلب أعداد المنشورات المباشرة بسرعة كبيرة. يُرجى الانتظار %{time_left} قبل إعادة المحاولة."
+      unsubscribe_via_email: "لقد وصلت إلى الحد الأقصى لعدد حالات إلغاء الاشتراك عبر البريد الإلكتروني. يُرجى الانتظار %{time_left} قبل إعادة المحاولة."
+      topic_invitations_per_day: "لقد وصلت إلى الحد الأقصى من دعوات الموضوعات. يمكنك إرسال المزيد من الدعوات بعد %{time_left}."
     hours:
       zero: "%{count} ساعة"
       one: "ساعة واحدة (%{count})"
@@ -462,6 +814,7 @@ ar:
       few: "%{count} ثوانٍ"
       many: "%{count} ثانية"
       other: "%{count} ثانية"
+    short_time: "بضع ثوانٍ"
   datetime:
     distance_in_words:
       half_a_minute: "< 1د"
@@ -624,6 +977,9 @@ ar:
     title: "إعادة ضبط كلمة المرور"
     success: "لقد غيَّرت كلمة مرورك وسجَّلت الدخول بنجاح."
     success_unapproved: "لقد غيَّرت كلمة مرورك بنجاح."
+  email_login:
+    invalid_token: "عذرًا، رابط تسجيل الدخول عبر البريد الإلكتروني قديم جدًا. اضغط على زر تسجيل الدخول واستخدم \"لقد نسيت كلمة المرور\" للحصول على رابط جديد."
+    title: "تسجيل الدخول عبر البريد الإلكتروني"
   user_auth_tokens:
     browser:
       chrome: "Google Chrome"
@@ -636,6 +992,7 @@ ar:
       unknown: "متصفح مجهول"
     device:
       android: "جهاز Android"
+      chromebook: "نظام تشغيل Chrome OS"
       ipad: "iPad"
       iphone: "iPhone"
       ipod: "iPod"
@@ -646,17 +1003,37 @@ ar:
       unknown: "جهاز مجهول"
     os:
       android: "Android"
+      chromeos: "نظام تشغيل Chrome OS"
       ios: "iOS"
       linux: "Linux"
       macos: "macOS"
       windows: "Microsoft Windows"
       unknown: "نظام تشغيل مجهول"
   change_email:
+    wrong_account_error: "لقد سجَّلت الدخول إلى الحساب الخاطئ، يُرجى تسجيل الخروج وإعادة المحاولة."
     confirmed: "تم تحديث بريدك الإلكتروني."
     please_continue: "المتابعة إلى %{site_name}"
     error: "حدث خطأ في أثناء تغيير عنوان بريدك الإلكتروني. ربما يكون العنوان مستخدمًا بالفعل."
+    doesnt_exist: "عنوان البريد الإلكتروني هذا غير مرتبط بحسابك."
     error_staged: "حدث خطأ في أثناء تغيير عنوان بريدك الإلكتروني. العنوان الذى ادخلته مُستخدَم بواسطة مستخدم مؤقت."
     already_done: "عذرًا، لم يعُد رابط التأكيد هذا صالحًا. ربما تم تغيير بريدك الإلكتروني بالفعل."
+    confirm: "تأكيد"
+    max_secondary_emails_error: "لقد وصلت إلى الحد الأقصى المسموح به من عناوين البريد الإلكتروني الثانوية."
+    authorizing_new:
+      title: "تأكيد عنوان بريدك الإلكتروني الجديد"
+      description: "يُرجى تأكيد رغبتك في تغيير عنوان بريدك الإلكتروني إلى:"
+      description_add: "يُرجى تأكيد رغبتك في إضافة عنوان بريد إلكتروني بديل:"
+    authorizing_old:
+      title: "تغيير عنوان بريدك الإلكتروني"
+      description: "يُرجى تأكيد تغيير عنوان بريدك الإلكتروني"
+      description_add: "يُرجى تأكيد رغبتك في إضافة عنوان بريد إلكتروني بديل:"
+      old_email: "البريد الإلكتروني القديم: %{email}"
+      new_email: "البريد الإلكتروني الجديد: %{email}"
+      almost_done_title: "تأكيد عنوان البريد الإلكتروني الجديد"
+      almost_done_description: "لقد أرسلنا رسالة إلكترونية إلى عنوان بريدك الإلكتروني الجديد لتأكيد التغيير!"
+  associated_accounts:
+    revoke_failed: "فشل إلغاء حسابك مع %{provider_name}."
+    connected: "(متصل)"
   activation:
     action: "انقر هنا لتفعيل حسابك."
     already_done: "عذرًا، لم يعُد رابط تأكيد الحساب صالحًا. ربما يكون الحساب نشطًا بالفعل."
@@ -665,8 +1042,10 @@ ar:
     welcome_to: "مرحبًا بك في %{site_name}!"
     approval_required: "يجب على المشرف الموافقة على حسابك الجديد يدويًا للوصول إلى هذا المنتدى. ستتلقى رسالة إلكترونية عندما يتم قبول حسابك."
     missing_session: "لا يمكننا تحديد ما إذا كان حسابك قد تم إنشاؤه. يُرجى التأكد من تمكين ملفات تعريف الارتباط."
+    activated: "عذرًا، لقد تم تنشيط هذا الحساب بالفعل."
     admin_confirm:
       title: "تأكيد حساب المسؤول"
+      description: "هل تريد بالتأكيد أن يصبح <b>%{target_username} (%{target_email})</b> مسؤولًا؟"
       grant: "منح إذن وصول المسؤول"
       complete: "أصبح المستخدم <b>%{target_username}</b> مسؤولًا الآن."
       back_to: "الرجوع إلي %{title}"
@@ -677,20 +1056,27 @@ ar:
     off_topic:
       title: "خارج الموضوع"
       description: "لا صلة للمنشور بالمناقشة الحالية كما هو محدَّد في العنوان وأول منشور، وربما ينبغي نقله إلى مكان أخر."
+      short_description: "لا علاقة له بالمناقشة"
     spam:
       title: "غير مرغوب فيه"
       description: "هذا المنشور عبارة عن إعلان أو منشور تخريبي. ولا صلة له بالموضوع الحالي."
+      short_description: "هذا إعلان أو تخريب"
       email_title: 'تم الإبلاغ عن "%{title}" كمنشور غير مرغوب فيه'
       email_body: "%{link}\n\n%{message}"
     inappropriate:
       title: "غير لائق"
+      description: 'يتضمَّن هذا المنشور محتوًى قد يعتبره شخص عاقل مسيئًا أو ينتهك <a href="%{base_path}/guidelines">إرشادات مجتمعنا</a>.'
+      short_description: 'ينتهك <a href="%{base_path}/guidelines">إرشادات مجتمعنا</a>.'
     notify_user:
       title: "مراسلة @%{username}"
+      description: "أريد التحدث إلى هذا الشخص بشكلٍ مباشر وشخصي عن منشوره."
+      short_description: "أريد التحدث إلى هذا الشخص بشكلٍ مباشر وشخصي عن منشوره."
       email_title: 'منشورك في "%{title}"'
       email_body: "%{link}\n\n%{message}"
     notify_moderators:
       title: "سبب آخر"
       description: "يستدعي هذا المنشور انتباه فريق العمل لسبب آخر لم يتم ذكره أعلاه."
+      short_description: "يتطلب انتباه فريق العمل لسبب آخر"
       email_title: 'يستدعي منشور في "%{title}" انتباه فريق العمل'
       email_body: "%{link}\n\n%{message}"
     bookmark:
@@ -703,10 +1089,18 @@ ar:
       short_description: "تسجيل الإعجاب بهذا المنشور"
   draft:
     sequence_conflict_error:
+      title: "خطأ في المسودة"
       description: "المسودة قيد التعديل في نافذة أخرى. يُرجى إعادة تحميل هذه الصفحة."
+  draft_backup:
+    pm_title: "المسودات الاحتياطية من الموضوعات الجارية"
+    pm_body: "موضوع يحتوي على مسودات احتياطية"
   user_activity:
+    no_default:
+      self: "ليس لديك نشاط حتى الآن."
+      others: "لا يوجد نشاط."
     no_bookmarks:
       self: "ليس لديك منشورات عليها إشارة مرجعية؛ تُتيح لك الإشارات المرجعية الرجوع إلى المنشورات التي تريدها بسرعة."
+      search: "لم يتم العثور على إشارات مرجعية تطابق استعلام البحث المقدَّم."
       others: "لا توجد إشارات مرجعية."
     no_likes_given:
       self: "لم تسجِّل إعجابك بأي منشور."
@@ -714,21 +1108,58 @@ ar:
     no_replies:
       self: "لم ترد على أي منشور."
       others: "لا توجد ردود."
+    no_drafts:
+      self: "ليس لديك أي مسودات. ابدأ في كتابة رد في أي موضوع وسيتم حفظه تلقائيًا كمسودة جديدة."
+  email_settings:
+    pop3_authentication_error: "حدثت مشكلة في بيانات اعتماد POP3 المقدَّمة، تحقَّق من اسم المستخدم وكلمة المرور وحاول مرة أخرى."
+    imap_authentication_error: "حدثت مشكلة في بيانات اعتماد IMAP المقدَّمة، تحقَّق من اسم المستخدم وكلمة المرور وحاول مرة أخرى."
+    imap_no_response_error: "حدث خطأ في أثناء الاتصال بخادم IMAP. %{message}"
+    smtp_authentication_error: "حدثت مشكلة في بيانات اعتماد SMTP المقدَّمة، تحقَّق من اسم المستخدم وكلمة المرور وحاول مرة أخرى."
+    authentication_error_gmail_app_password: 'مطلوب كلمة مرور خاصة بالتطبيقات. تعرَّف على مزيد من المعلومات من خلال <a target="_blank" href="https://support.google.com/accounts/answer/185833">مقالة المساعدة هذه من Google</a>'
+    smtp_server_busy_error: "خادم SMTP مشغول حاليًا، حاول مرة أخرى لاحقًا."
+    smtp_unhandled_error: "حدث خطأ لم تتم معالجته عند الاتصال بخادم SMTP. %{message}"
+    imap_unhandled_error: "حدث خطأ لم تتم معالجته عند الاتصال بخادم IMAP. %{message}"
+    connection_error: "حدثت مشكلة في الاتصال بالخادم، تحقَّق من اسم الخادم والمنفذ وحاول مرة أخرى."
+    timeout_error: "انتهت مهلة الاتصال بالخادم، تحقَّق من اسم الخادم والمنفذ وحاول مرة أخرى."
+    unhandled_error: "حدث خطأ لم تتم معالجته عند اختبار إعدادات البريد الإلكتروني. %{message}"
+  webauthn:
+    validation:
+      invalid_type_error: "نوع webauthn الذي تم تقديمه غير صالح. الأنواع الصالحة هي webauthn.get وwebauthn.create."
+      challenge_mismatch_error: "لا يتطابق التحدي المقدَّم مع التحدي الذي تم إنشاؤه بواسطة خادم المصادقة."
+      invalid_origin_error: "لا يتطابق مصدر طلب المصادقة مع مصدر الخادم."
+      malformed_attestation_error: "حدث خطأ في أثناء فك تشفير بيانات التصديق."
+      invalid_relying_party_id_error: "لا يتطابق معرِّف الطرف المعتمد لطلب المصادقة مع معرِّف الطرف المعتمد على الخادم."
+      user_verification_error: "مطلوب التحقُّق من المستخدم."
+      unsupported_public_key_algorithm_error: "لا يدعم الخادم خوارزمية المفتاح العام المقدَّمة."
+      unsupported_attestation_format_error: "لا يدعم الخادم تنسيق التصديق."
+      credential_id_in_use_error: "معرِّف بيانات الاعتماد المقدَّم مُستخدَم بالفعل."
+      public_key_error: "فشل التحقُّق من المفتاح العام لبيانات الاعتماد."
+      ownership_error: "مفتاح الأمان ليس مملوكًا للمستخدم."
+      not_found_error: "تعذَّر العثور على مفتاح أمان بمعرِّف بيانات الاعتماد المقدَّم."
+      unknown_cose_algorithm_error: "لم يتم التعرف على الخوارزمية المُستخدَمة لمفتاح الأمان."
   topic_flag_types:
     spam:
       title: "غير مرغوب فيه"
       description: "هذا الموضوع عبارة عن إعلان. وليس مفيدًا أو ذا صلة بهذا الموقع؛ إنه ترويجي فقط."
       long_form: "أبلغ عن هذا الموضوع كغير مرغوب فيه"
+      short_description: "هذا إعلان"
     inappropriate:
       title: "غير لائق"
+      description: 'يتضمَّن هذا الموضوع محتوًى قد يعتبره شخص عاقل مسيئًا أو ينتهك <a href="%{base_path}/guidelines">إرشادات مجتمعنا</a>.'
       long_form: "أبلغ عن هذا الموضوع كغير لائق"
+      short_description: 'ينتهك <a href="%{base_path}/guidelines">إرشادات مجتمعنا</a>.'
     notify_moderators:
       title: "سبب آخر"
+      description: 'يتطلب هذا الموضوع انتباهًا عامًا من فريق العمل بناءً على <a href="%{base_path}/guidelines">الإرشادات</a>، أو <a href="%{tos_url}">شروط الخدمة</a>، أو لسبب آخر غير مذكور أعلاه.'
       long_form: "أبلغ عن هذا الموضوع لتنبيه المشرفين"
+      short_description: "يتطلب انتباه فريق العمل لسبب آخر"
       email_title: 'يستدعي الموضوع "%{title}" انتباه المشرفين'
       email_body: "%{link}\n\n%{message}"
   flagging:
+    you_must_edit: '<p>تم الإبلاغ عن منشورك بواسطة المجتمع. يُرجى <a href="%{path}">الاطِّلاع على رسائلك</a>.</p>'
     user_must_edit: "<p>أبلغ المجتمع عن هذا المنشور وتم إخفاؤه مؤقتًا.</p>"
+  ignored:
+    hidden_content: "<p>محتوى تم تجاهله</p>"
   archetypes:
     regular:
       title: "موضوع عادي"
@@ -738,16 +1169,27 @@ ar:
         make: "لقد أصبح هذا الموضوع بانرًا الآن. وسيظهر في أعلى كل صفحة حتى يزيله المستخدم."
         remove: "لم يعُد هذا الموضوع بانرًا. ولن يظهر بعد الآن في أعلى كل صفحة."
   unsubscribed:
+    title: "تم تحديث تفضيلات البريد الإلكتروني!"
+    description: "تم تحديث تفضيلات البريد الإلكتروني للعنوان <b>%{email}</b>. لتغيير إعدادات بريدك الإلكتروني، <a href='%{url}'>انتقل إلى تفضيلات المستخدم</a>."
     topic_description: "لإعادة الاشتراك في %{link}، استخدم إدارة التنبيهات في أسفل أو يسار الموضوع."
+    private_topic_description: "لإعادة الاشتراك، استخدم عنصر التحكُّم في الإشعارات في أسفل أو يسار الموضوع."
+  uploads:
+    marked_insecure_from_theme_component_reason: "التحميل المُستخدَم في مكوِّن السمة"
   unsubscribe:
     title: "إلغاء الاشتراك"
     stop_watching_topic: "إيقاف مراقبة هذا الموضوع، %{link}"
     mute_topic: "كتم جميع الإشعارات لهذا الموضوع، %{link}"
     unwatch_category: "إيقاف مراقبة جميع الموضوعات في %{category}"
     mailing_list_mode: "إيقاف تشغيل وضع القائمة البريدية"
+    all: "عدم مراسلتي من %{sitename}"
     different_user_description: "لقد سجَّلت الدخول حاليًا كمستخدم مختلف عن الذي راسلناه. يُرجى تسجيل الخروج أو دخول وضع التخفي، ثم إعادة المحاولة."
+    not_found_description: "عذرًا، لم نتمكن من العثور على إلغاء الاشتراك هذا. من المحتمل أن الرابط الموجود في بريدك الإلكتروني قديم جدًا وانتهت صلاحيته؟"
     log_out: "تسجيل الخروج"
+    submit: "حفظ التفضيلات"
     digest_frequency:
+      title: "أنت تتلقى رسائل إلكترونية تلخيصية %{frequency}"
+      never_title: "أنت لا تتلقى رسائل إلكترونية تلخيصية"
+      select_title: "ضبط مدى تكرار الرسائل الإلكترونية التلخيصية على:"
       never: "أبدًا"
       every_30_minutes: "كل 30 دقيقة"
       every_hour: "كل ساعة"
@@ -761,6 +1203,8 @@ ar:
     read: "قراءة"
     read_write: "قراءة/كتابة"
     description: 'يطلب "%{application_name}" إذن الوصول التالي إلى حسابك:'
+    instructions: 'لقد أنشأنا للتو مفتاح API جديد للمستخدم لتستخدمه مع "%{application_name}"، يُرجى لصق المفتاح التالي في تطبيقك:'
+    otp_description: 'هل ترغب في السماح للتطبيق "%{application_name}" بالوصول إلى هذا الموقع؟'
     otp_confirmation:
       confirm_title: المتابعة إلى %{site_name}
       logging_in_as: تسجيل الدخول باسم %{username}
@@ -770,62 +1214,129 @@ ar:
     scopes:
       message_bus: "التحديثات المباشرة"
       notifications: "قراءة الإشعارات ومسحها"
+      push: "إرسال الإشعارات الفورية إلى الخدمات الخارجية"
       session_info: "قراءة معلومات جلسة المستخدم"
       read: "قراءة الكل"
       write: "كتابة الكل"
+      one_time_password: "إنشاء رمز تسجيل الدخول لمرة واحدة"
+      bookmarks_calendar: "قراءة تذكيرات الإشارات المرجعية"
+    invalid_public_key: "عذرًا، المفتاح العام غير صالح."
+    invalid_auth_redirect: "عذرًا، هذا المضيف auth_redirect غير مسموح به."
+    invalid_token: "الرمز مفقود أو غير صالح أو منتهي الصلاحية."
+  flags:
+    errors:
+      already_handled: "تم التعامل مع البلاغ بالفعل"
   reports:
     default:
       labels:
         count: العدد
+        percent: النسبة المئوية
         day: اليوم
     post_edits:
+      title: "تعديلات المنشور"
       labels:
         edited_at: التاريخ
         post: المنشور
         editor: المحرِّر
+        author: المؤلف
         edit_reason: السبب
+      description: "عدد التعديلات على المنشور الجديد."
     user_flagging_ratio:
+      title: "نسبة إبلاغ المستخدم"
       labels:
         user: المستخدم
+        agreed_flags: البلاغات الموافَق عليها
+        disagreed_flags: البلاغات غير الموافَق عليها
+        ignored_flags: البلاغات المتجاهَلة
         score: النقاط
+      description: "قائمة المستخدمين مرتَّبة حسب نسبة استجابة فريق العمل لبلاغاتهم (من غير الموافَق عليها إلى الموافَق عليها)."
     moderators_activity:
+      title: "نشاط المشرفين"
       labels:
         moderator: مشرف
+        flag_count: البلاغات المُراجَعة
+        time_read: وقت القراءة
+        topic_count: الموضوعات المنشأة
+        post_count: المنشورات المنشأة
+        pm_count: الرسائل الخاصة المنشأة
+        revision_count: المراجعات
+      description: قائمة نشاط المشرف متضمنةً الوسوم المُراجَعة، ووقت القراءة، والموضوعات المنشأة، والمنشورات المنشأة، والرسائل الخاصة المنشأة، والمراجعات.
     flags_status:
+      title: "حالة البلاغات"
+      values:
+        agreed: الموافَق عليها
+        disagreed: غير الموافَق عليها
+        deferred: المؤجلة
+        no_action: التي لم يتم اتخاذ إجراء بشأنها
       labels:
         flag: النوع
+        assigned: المسندة
+        poster: كاتب المنشور
+        flagger: مقدِّم البلاغ
+        time_to_resolution: وقت التعامل معه
+      description: "قائمة بحالات البلاغات متضمنةً نوع البلاغ، وكاتب المنشور، ومقدِّم البلاغ، والوقت حتى التعامل معه."
     visits:
       title: "زيارات المستخدم"
       xaxis: "اليوم"
       yaxis: "عدد الزيارات"
+      description: "عدد جميع زيارات المستخدم"
     signups:
+      title: "الاشتراكات"
       xaxis: "اليوم"
+      yaxis: "عدد الاشتراكات"
+      description: "تسجيلات الحسابات الجديدة لهذه الفترة"
     new_contributors:
+      title: "المساهمون الجُدد"
       xaxis: "اليوم"
+      yaxis: "عدد المساهمين الجُدد"
+      description: "عدد المستخدمين الذين نشروا أول منشور لهم خلال هذه الفترة"
     trust_level_growth:
+      title: "زيادة مستوى الثقة"
+      xaxis:
+        tl1_reached: "وصلت إلى مستوى الثقة 1"
+        tl2_reached: "وصلت إلى مستوى الثقة 2"
+        tl3_reached: "وصلت إلى مستوى الثقة 3"
+        tl4_reached: "وصلت إلى مستوى الثقة 4"
       yaxis: "اليوم"
+      description: "عدد المستخدمين الذين زاد مستوى الثقة لديهم خلال هذه الفترة."
     consolidated_page_views:
+      title: "مرات عرض الصفحة الموحَّدة"
+      xaxis:
+        page_view_crawler: "زاحفات الويب"
+        page_view_anon: "المستخدمون المجهولون"
+        page_view_logged_in: "المستخدمون الذين سجَّلوا الدخول"
       yaxis: "اليوم"
+      description: "مرات عرض الصفحة للمستخدمين الذين سجَّلوا الدخول والمستخدمين المجهولين وزاحفات الويب."
       labels:
         post: المنشور
         editor: المحرِّر
+        author: المؤلف
         edit_reason: السبب
     dau_by_mau:
+      title: "المستخدمون النشطون يوميًا/المستخدمون النشطون شهريًا"
       xaxis: "اليوم"
+      yaxis: "المستخدمون النشطون يوميًا/المستخدمون النشطون شهريًا"
+      description: "عدد الأعضاء الذين سجَّلوا الدخول في اليوم الماضي مقسومًا على عدد الأعضاء الذين سجَّلوا الدخول في الشهر الماضي - يتم عرض نسبة مئوية تشير إلى \"الاستمرار في المتابعة\" للمجتمع. ننصحك بالبقاء فوق 30%."
     daily_engaged_users:
+      title: "المستخدمون المتفاعلون يوميًا"
       xaxis: "اليوم"
+      yaxis: "المستخدمون المتفاعلون"
+      description: "عدد المستخدمين الذين سجَّلوا إعجابهم أو نشروا منشورات في اليوم الماضي"
     profile_views:
       title: "مرات عرض الملف التعريفي للمستخدم"
       xaxis: "اليوم"
       yaxis: "عدد الملفات الشخصية للمستخدمين التي تم عرضها"
+      description: "إجمالي مرات العرض الجديدة للملفات الشخصية للمستخدمين"
     topics:
       title: "الموضوعات"
       xaxis: "اليوم"
       yaxis: "عدد الموضوعات الجديدة"
+      description: "الموضوعات الجديدة التي تم إنشاؤها خلال هذه الفترة"
     posts:
       title: "المنشورات"
       xaxis: "اليوم"
       yaxis: "عدد المنشورات الجديدة"
+      description: "المنشورات الجديدة التي تم إنشاؤها خلال هذه الفترة"
     likes:
       title: "اﻹعجابات"
       xaxis: "اليوم"
@@ -835,16 +1346,22 @@ ar:
       title: "البلاغات"
       xaxis: "اليوم"
       yaxis: "عدد البلاغات"
+      description: "عدد البلاغات الجديدة"
     bookmarks:
       title: "الإشارات المرجعية"
       xaxis: "اليوم"
       yaxis: "عدد الإشارات المرجعية الجديدة"
+      description: "عدد الموضوعات والمنشورات الجديدة التي تم وضع إشارة مرجعية عليها"
     users_by_trust_level:
       title: "المستخدمون لكل مستوى ثقة"
       xaxis: "مستوى الثقة"
       yaxis: "عدد المستخدمين"
+      labels:
+        level: المستوى
+      description: "عدد المستخدمين الذين تم تجميعهم حسب مستوى الثقة"
       description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/"
     users_by_type:
+      title: "المستخدمون لكل نوع"
       xaxis: "النوع"
       yaxis: "عدد المستخدمين"
       labels:
@@ -853,32 +1370,50 @@ ar:
         admin: مسؤول
         moderator: مشرف
         suspended: معلَّق
+        silenced: المكتومون
+      description: "عدد المستخدمين الذين تم تجميعهم بواسطة المسؤول والمشرف، والمعلَّقين والمكتومين."
+    trending_search:
+      title: مصطلحات البحث الرائجة
+      labels:
+        term: المصطلح
+        searches: عدد مرات البحث
+        click_through: نسبة النقر إلى الظهور
+      description: "مصطلحات البحث الأكثر رواجًا حسب نسبة النقر إلى الظهور"
     emails:
       title: "الرسائل الإلكترونية المُرسَلة"
       xaxis: "اليوم"
       yaxis: "عدد الرسائل الإلكترونية"
+      description: "عدد الرسائل الإلكترونية الجديدة التي تم إرسالها"
     user_to_user_private_messages:
+      title: "مستخدم إلى مستخدم (باستثناء الردود)"
       xaxis: "اليوم"
       yaxis: "عدد الرسائل"
+      description: "عدد الرسائل الخاصة التي تم إنشاؤها حديثًا"
     user_to_user_private_messages_with_replies:
+      title: "مستخدم إلى مستخدم (مع تضمين الردود)"
       xaxis: "اليوم"
       yaxis: "عدد الرسائل"
+      description: "عدد جميع الرسائل والردود الخاصة الجديدة"
     system_private_messages:
       title: "النظام"
       xaxis: "اليوم"
       yaxis: "عدد الرسائل"
+      description: "عدد الرسائل الخاصة التي يُرسلها النظام تلقائيًا"
     moderator_warning_private_messages:
       title: "تحذير من المشرف"
       xaxis: "اليوم"
       yaxis: "عدد الرسائل"
+      description: "عدد التحذيرات التي تم إرسالها من خلال رسائل خاصة من المشرفين."
     notify_moderators_private_messages:
       title: "إرسال إشعار إلى المشرفين"
       xaxis: "اليوم"
       yaxis: "عدد الرسائل"
+      description: "عدد المرات التي تم فيها إرسال إشعار إلى المشرفين بشكلٍ خاص بواسطة بلاغ."
     notify_user_private_messages:
       title: "إرسال إشعار إلى المستخدم"
       xaxis: "اليوم"
       yaxis: "عدد الرسائل"
+      description: "عدد المرات التي تم فيها إرسال إشعار إلى المستخدمين بشكلٍ خاص بواسطة بلاغ."
     top_referrers:
       title: "أفضل المُحيلين"
       xaxis: "المستخدم"
@@ -888,6 +1423,7 @@ ar:
         user: "مستخدم"
         num_clicks: "النقرات"
         num_topics: "الموضوعات"
+      description: "المستخدمون مُدرَجون حسب عدد النقرات على الروابط التي شاركوها"
     top_traffic_sources:
       title: "أفضل مصادر الزيارات"
       xaxis: "النطاق"
@@ -898,35 +1434,43 @@ ar:
         domain: النطاق
         num_clicks: النقرات
         num_topics: الموضوعات
+      description: "المصادر الخارجية التي شاركت رابطًا إلى هذا الموقع أكثر من غيرها"
     top_referred_topics:
       title: "أفضل الموضوعات المحال إليها"
       labels:
         num_clicks: "النقرات"
         topic: "موضوع"
+      description: "الموضوعات التي تلقت أكبر عدد من النقرات من مصادر خارجية"
     page_view_anon_reqs:
       title: "مجهول"
       xaxis: "اليوم"
       yaxis: "مرات العرض المجهولة للصفحة"
+      description: "عدد مرات العرض الجديدة للصفحة للزوار الذين لم يسجِّلوا الدخول إلى حساب"
     page_view_logged_in_reqs:
       title: "مسجِّل الدخول"
       xaxis: "اليوم"
       yaxis: "مرات عرض مُسجلي الدخول للصفحة"
+      description: "عدد مرات العرض الجديدة للصفحة من المستخدمين الذين سجَّلوا الدخول"
     page_view_crawler_reqs:
       title: "مرات عرض زاحف الويب للصفحة"
       xaxis: "اليوم"
       yaxis: "مرات عرض زاحف الويب للصفحة"
+      description: "إجمالي مرات عرض الصفحة من زاحفات الويب بمرور الوقت"
     page_view_total_reqs:
       title: "مرات عرض الصفحة"
       xaxis: "اليوم"
       yaxis: "إجمالي مرات عرض الصفحة"
+      description: "عدد مرات العرض الجديدة للصفحة من جميع الزوار"
     page_view_logged_in_mobile_reqs:
       title: "مرات عرض مُسجلي الدخول للصفحة"
       xaxis: "اليوم"
       yaxis: "مرات عرض مُسجلي الدخول على الجوَّال للصفحة"
+      description: "عدد مرات العرض الجديدة للصفحة من المستخدمين على الأجهزة الجوَّالة والذين سجَّلوا الدخول إلى حساب"
     page_view_anon_mobile_reqs:
       title: "مرات عرض المجهولين للصفحة"
       xaxis: "اليوم"
       yaxis: "مرات عرض المجهولين للصفحة على الجوَّال"
+      description: "عدد مرات العرض الجديدة للصفحة من الزوار على الأجهزة الجوَّالة والذين لم يسجِّلوا الدخول"
     http_background_reqs:
       title: "الخلفية"
       xaxis: "اليوم"
@@ -955,138 +1499,353 @@ ar:
       title: "الوقت حتى أول رد"
       xaxis: "اليوم"
       yaxis: "متوسط الوقت (بالساعات)"
+      description: "متوسط الوقت (بالساعات) حتى الرد الأول على الموضوعات الجديدة"
     topics_with_no_response:
       title: "الموضوعات دون رد"
       xaxis: "اليوم"
       yaxis: "الإجمالي"
+      description: "عدد الموضوعات الجديدة التي تم إنشاؤها ولم تتلقَّ ردًا"
     mobile_visits:
+      title: "عدد زيارات المستخدمين (على الجوَّال)"
       xaxis: "اليوم"
       yaxis: "عدد الزيارات"
+      description: "عدد المستخدمين المميزين الذين زاروا الموقع باستخدام جهاز جوَّال."
     web_crawlers:
+      title: "وكلاء مستخدمي زاحفات الويب"
       labels:
+        user_agent: "وكيل المستخدم"
         page_views: "مرات عرض الصفحة"
+      description: "قائمة وكلاء مستخدمي زاحفات الويب، مرتَّبة حسب مرات عرض الصفحة."
     suspicious_logins:
+      title: "عمليات تسجيل الدخول المشبوهة"
       labels:
         user: المستخدم
+        client_ip: عنوان IP للعميل
         location: الموقع الجغرافي
+        browser: المتصفح
+        device: الجهاز
+        os: نظام التشغيل
+        login_time: وقت تسجيل الدخول
+      description: "تفاصيل عمليات تسجيل الدخول الجديدة التي تختلف بشكلٍ مريب عن عمليات تسجيل الدخول السابقة"
     staff_logins:
+      title: "عمليات تسجيل دخول المسؤول"
       labels:
         user: المستخدم
         location: الموقع الجغرافي
+        login_at: تسجيل الدخول في
+      description: "قائمة بأوقات تسجيل دخول المسؤول مع تحديد المواقع"
     top_uploads:
+      title: "أعلى التحميلات"
       labels:
         filename: اسم الملف
+        extension: الامتداد
+        author: المؤلف
+        filesize: حجم الملف
+      description: "إدراج جميع التحميلات حسب الامتداد وحجم الملف والمؤلف"
+    top_ignored_users:
+      title: "أهم المستخدمين الذين تم تجاهلهم/كتمهم"
+      labels:
+        ignored_user: مستخدم تم تجاهله
+        ignores_count: عدد التجاهلات
+        mutes_count: عدد مرات الكتم
+      description: "المستخدمون الذين تم كتمهم أو تجاهلهم بواسطة العديد من المستخدمين الآخرين"
   dashboard:
     rails_env_warning: "الخادم يعمل في وضع %{env}."
     host_names_warning: "يستخدم ملف config/database.yml اسم المضيف الافتراضي localhost. حدِّثه لاستخدام اسم مضيف موقعك."
     sidekiq_warning: 'Sidekiq ليس قيد التشغيل! يتم تنفيذ العديد من المهام، مثل إرسال الرسائل الإلكترونية، بشكلٍ غير متزامن من خلال sidekiq. يُرجى التأكد من وجود عملية sidekiq واحدة على الأقل قيد التشغيل. <a href="https://github.com/mperham/sidekiq" target="_blank">معرفة المزيد عن Sidekiq من هنا</a>.'
     queue_size_warning: "عدد المهام في قائمة الانتظار هو %{queue_size}، وهذا رقم كبير. قد يكون ذلك مؤشرًا على وجود مشكلة في عمليات Sidekiq، أو قد تحتاج إضافة المزيد من عمال Sidekiq."
     memory_warning: "يعمل الخادم بإجمالي ذاكرة أقل من 1 غ.ب. يوصى بتوفُّر 1 غ.ب من الذاكرة على الأقل."
+    google_oauth2_config_warning: 'تم إعداد الخادم للسماح بالاشتراك وتسجيل الدخول باستخدام Google OAuth2 (enable_google_oauth2_logins)، ولكن لم يتم ضبط معرِّف العميل والقيم السرية للعميل. انتقل إلى <a href="%{base_path}/admin/site_settings">إعدادات الموقع</a> وحدِّث الإعدادات. <a href="https://meta.discourse.org/t/configuring-google-login-for-discourse/15858" target="_blank">راجع هذا الدليل لمعرفة المزيد</a>.'
+    facebook_config_warning: 'تم إعداد الخادم للسماح بالاشتراك وتسجيل الدخول باستخدام Facebook (enable_facebook_logins)، ولكن لم يتم ضبط معرِّف العميل والقيم السرية للعميل. انتقل إلى <a href="%{base_path}/admin/site_settings">the إعدادات الموقع</a> وحدِّث الإعدادات. <a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">راجع هذا الدليل لمعرفة المزيد</a>.'
+    twitter_config_warning: 'تم إعداد الخادم للسماح بالاشتراك وتسجيل الدخول باستخدام Twitter (enable_twitter_logins)، ولكن لم يتم ضبط معرِّف العميل والقيم السرية للعميل. انتقل إلى <a href="%{base_path}/admin/site_settings">the إعدادات الموقع</a> وحدِّث الإعدادات. <a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">راجع هذا الدليل لمعرفة المزيد</a>.'
+    github_config_warning: 'تم إعداد الخادم للسماح بالاشتراك وتسجيل الدخول باستخدام GitHub (enable_github_logins)، ولكن لم يتم ضبط معرِّف العميل والقيم السرية للعميل. انتقل إلى <a href="%{base_path}/admin/site_settings">إعدادات الموقع</a> وحدِّث الإعدادات. <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">راجع هذا الدليل لمعرفة المزيد</a>.'
+    s3_config_warning: 'تم إعداد الخادم لتحميل الملفات إلى S3، ولكن لم يتم ضبط أحد الإعدادات التالية على الأقل: s3_access_key_id أو s3_secret_access_key أو s3_use_iam_profile أو s3_upload_bucket. انتقل إلى <a href="%{base_path}/admin/site_settings">إعدادات الموقع</a> وحدِّث الإعدادات. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">راجع "طريقة إعداد تحميلات الصور إلى S3" لمعرفة المزيد</a>.'
+    s3_backup_config_warning: 'تم إعداد الخادم لتحميل النسخ الاحتياطية إلى S3، ولكن لم يتم ضبط أحد الإعدادات التالية على الأقل: s3_access_key_id أو s3_secret_access_key أو s3_use_iam_profile أو s3_backup_bucket. انتقل إلى <a href="%{base_path}/admin/site_settings">إعدادات الموقع</a> وحدِّث الإعدادات. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">راجع "طريقة إعداد تحميلات الصور إلى S3" لمعرفة المزيد</a>.'
+    s3_cdn_warning: 'تم إعداد الخادم لتحميل الملفات إلى S3، ولكن لم يتم إعداد شبكة توصيل المحتوى على S3. يمكن أن يؤدي ذلك إلى تكاليف باهظة لخدمة S3 وأداء أبطأ للموقع. <a href="https://meta.discourse.org/t/-/148916" target="_blank">راجع "استخدام مساحة تخزين الكائنات للتحميلات" لمعرفة المزيد</a>.'
+    image_magick_warning: 'تم إعداد الخادم لإنشاء صور مصغَّرة للصور الكبيرة، ولكن لم يتم تثبيت ImageMagick. ثبِّت ImageMagick باستخدام مدير الحزم المفضَّل لديك أو <a href="https://www.imagemagick.org/script/download.php" target="_blank">نزِّل أحدث إصدار</a>.'
+    failing_emails_warning: 'هناك %{num_failed_jobs} مهمة بريد إلكتروني فشلت. تحقَّق من app.yml وتأكَّد من صحة إعدادات خادم البريد. <a href="%{base_path}/sidekiq/retries" target="_blank">راجع المهام التي فشلت في Sidekiq</a>.'
     subfolder_ends_in_slash: "إعداد المجلد الفرعي غير صحيح، تنتهي قيمة DISCOURSE_RELATIVE_URL_ROOT بشرطة مائلة."
+    email_polling_errored_recently:
+      zero: "نتج عن استقصاء تلقي الرسائل الإلكترونية %{count} خطأ في آخر 24 ساعة. راجع <a href='%{base_path}/logs' target='_blank'>السجلات</a> لمزيد من التفاصيل."
+      one: "نتج عن استقصاء تلقي الرسائل الإلكترونية خطأ واحد (%{count}) في آخر 24 ساعة. راجع <a href='%{base_path}/logs' target='_blank'>السجلات</a> لمزيد من التفاصيل."
+      two: "نتج عن استقصاء تلقي الرسائل الإلكترونية خطآن (%{count}) في آخر 24 ساعة. راجع <a href='%{base_path}/logs' target='_blank'>السجلات</a> لمزيد من التفاصيل."
+      few: "نتج عن استقصاء تلقي الرسائل الإلكترونية %{count} أخطاء في آخر 24 ساعة. راجع <a href='%{base_path}/logs' target='_blank'>السجلات</a> لمزيد من التفاصيل."
+      many: "نتج عن استقصاء تلقي الرسائل الإلكترونية %{count} خطأ في آخر 24 ساعة. راجع <a href='%{base_path}/logs' target='_blank'>السجلات</a> لمزيد من التفاصيل."
+      other: "نتج عن استقصاء تلقي الرسائل الإلكترونية %{count} خطأ في آخر 24 ساعة. راجع <a href='%{base_path}/logs' target='_blank'>السجلات</a> لمزيد من التفاصيل."
+    missing_mailgun_api_key: "تم إعداد الخادم لإرسال الرسائل الإلكترونية عبر Mailgun، لكنك لم تقدِّم مفتاح API المُستخدَم للتحقُّق من رسائل خطاف الويب."
+    bad_favicon_url: "فشل تحميل الرمز المفضَّل. تحقَّق من إعداد الرمز المفضَّل لديك في <a href='%{base_path}/admin/site_settings'>إعدادات الموقع</a>."
+    poll_pop3_timeout: "تنتهي مهلة الاتصال بخادم POP3. لا يمكن استرداد الرسائل الإلكترونية الواردة. يُرجى التحقُّق من <a href='%{base_path}/admin/site_settings/category/email'>إعدادات POP3</a> وموفِّر الخدمة."
+    poll_pop3_auth_error: "يفشل الاتصال بخادم POP3 بسبب خطأ في المصادقة. تحقَّق من <a href='%{base_path}/admin/site_settings/category/email'>إعدادات POP3</a> لديك."
+    force_https_warning: "يستخدم موقعك الإلكتروني SSL. ولكن لم يتم تفعيل `<a href='%{base_path}/admin/site_settings/category/all_results?filter=force_https'>force_https</a>` من إعدادات موقعك."
+    out_of_date_themes: "تتوفَّر تحديثات للسمات التالية:"
+    unreachable_themes: "لم نتمكن من التحقُّق من وجود تحديثات للسمات التالية:"
+    watched_word_regexp_error: "التعبير العادي للكلمات المُراقَبة للإجراء \"%{action}\" غير صالح. يُرجى التحقُّق من <a href='%{base_path}/admin/customize/watched_words'>إعدادات الكلمات المُراقَبة</a>، أو إيقاف إعداد الموقع `watched words regular expressions`."
   site_settings:
+    display_local_time_in_user_card: "عرض التوقيت المحلي بناءً على المنطقة الزمنية للمستخدم عند فتح بطاقة المستخدم الخاصة به."
     censored_words: "الكلمات التي سيتم استبدالها تلقائيًا بـ &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "حذف المنشورات المخفية تلقائيًا إذا زادت مدة الإخفاء عن 30 يومًا"
+    default_locale: "اللغة الافتراضية لمثيل Discourse هذا. يمكنك استبدال نص الفئات والموضوعات التي ينشئها النظام من <a href='%{base_path}/admin/customize/site_texts' target='_blank'>تخصيص/النص</a>."
     allow_user_locale: "السماح للمستخدمين باختيار لغة الواجهة التي يفضِّلونها"
+    set_locale_from_accept_language_header: "تعيين لغة الواجهة للمستخدمين المجهولين من رؤوس لغة متصفح الويب لديهم"
+    support_mixed_text_direction: "دعم الاتجاهات النصية المختلطة من اليمين إلى اليسار ومن اليسار إلى اليمين."
     min_post_length: "الحد الأدنى المسموح به لطول المنشور بالأحرف"
     min_first_post_length: "الحد الأدنى المسموح به لطول أول منشور (نص الموضوع) بالأحرف"
     min_personal_message_post_length: "الحد الأدنى المسموح به لطول المنشور بالأحرف في الرسائل"
     max_post_length: "الحد الأقصى المسموح به لطول المنشور بالأحرف"
     topic_featured_link_enabled: "السماح بنشر روابط في الموضوعات"
+    show_topic_featured_link_in_digest: "إظهار رابط الموضوع المميز في ملخص البريد الإلكتروني"
+    min_topic_views_for_delete_confirm: "الحد الأدنى لعدد المشاهدات التي يجب أن يتضمَّنها الموضوع حتى تظهر نافذة منبثقة للتأكيد عند حذفه"
     min_topic_title_length: "الحد الأدنى المسموح به لطول عنوان الموضوع بالأحرف"
     max_topic_title_length: "الحد الأقصى المسموح به لطول عنوان الموضوع بالأحرف"
     min_personal_message_title_length: "الحد الأدنى المسموح به لطول عنوان الرسالة بالأحرف"
+    max_emojis_in_title: "الحد الأقصى المسموح به من الرموز التعبيرية في عنوان الموضوع"
     min_search_term_length: "الحد الأدنى الصالح لطول مصطلح البحث بالأحرف"
     search_tokenize_chinese_japanese_korean: "فرض تقسيم جمل البحث في اللغات الصينية واليابانية والكورية إلى كلمات حتى على المواقع التي لا تدعم تلك اللغات"
     search_prefer_recent_posts: "سيحاول هذا الخيار البحث في فهرس أحدث المنشورات أولًا إذا كان البحث في منتداك الكبير بطيئًا"
     search_recent_posts_size: "عدد المنشورات الحديثة التي سيتم الإبقاء عليها في الفهرس"
+    log_search_queries: "تسجيل استعلامات البحث التي يجريها المستخدمون"
+    search_query_log_max_size: "الحد الأقصى من استعلامات البحث للاحتفاظ بها"
+    search_query_log_max_retention_days: "الحد الأقصى بالأيام لفترة الاحتفاظ باستعلامات البحث"
+    search_ignore_accents: "تجاهل التشكيل عند البحث عن نص"
+    category_search_priority_low_weight: "الأهمية المطبَّقة على الترتيب في الأولوية المنخفضة للبحث في الفئات"
+    category_search_priority_high_weight: "الأهمية المطبَّقة على الترتيب في الأولوية العالية للبحث في الفئات"
     allow_uncategorized_topics: "السماح بإنشاء الموضوعات دون تحديد فئة. تحذير: إذا كانت هناك موضوعات غير مصنَّفة بفئة، يجب عليك إعادة تصنيفها قبل إيقاف تشغيل هذا الإعداد."
     allow_duplicate_topic_titles: "السماح بالموضوعات ذات العناوين المتطابقة المتكررة"
+    allow_duplicate_topic_titles_category: "اسمح بالموضوعات ذات العناوين المتطابقة والمتكررة إذا كانت الفئة مختلفة. يجب أن تكون القيمة allow_duplicate_topic_titles مضبوطة على False."
     unique_posts_mins: "عدد الدقائق قبل أن يتمكن العضو من إنشاء منشور يتضمَّن المحتوى نفسه مجددًا"
     educate_until_posts: "إظهار اللوحة التعليمية المنبثقة للمستخدمين الجدُد عندما يبدأ العضو في كتابة منشوراته الأولى (n)"
     title: "اسم هذا الموقع كما هو مُستخدَم في وسم العنوان"
     site_description: "وصف هذا الموقع في جملة واحدة، كما في وسم الوصف التعريفي"
+    short_site_description: "وصف قصير، كما هو مستخدم في وسم العنوان على الصفحة الرئيسية."
+    contact_email: "عنوان البريد الإلكتروني لجهة الاتصال الرئيسية المسؤولة عن هذا الموقع. يتم استخدامه للإشعارات المهمة ويتم عرضه أيضًا على صفحة <a href='%{base_path}/about' target='_blank'>/about</a> للمسائل العاجلة."
+    contact_url: "عنوان URL للتواصل لهذا الموقع. يتم عرضه على صفحة <a href='%{base_path}/about' target='_blank'>/about</a> للمسائل العاجلة."
     crawl_images: "استعادة الصور من عناوين URL البعيدة لإدراج الأبعاد الصحيحة للطول والعرض"
     download_remote_images_to_local: "يمكن تحويل الصور البعيدة إلى صور محلية عن طريق تنزيلها، وبذلك تضمن عدم تلف الصور."
     download_remote_images_threshold: "الحد الأدنى من مساحة القرص اللازمة لتنزيل الصور البعيدة محليًا (بالنسبة المئوية)"
     disabled_image_download_domains: "لن يتم تنزيل الصور البعيدة من هذه النطاقات أبدًا. قائمة مفصولة بشرائط عمودية."
     editing_grace_period: "لن يؤدي التعديل إلى إنشاء نسخة جديدة في سجل المنشورات لمدة (n) ثانية بعد النشر."
+    editing_grace_period_max_diff: "الحد الأقصى لعدد تغييرات الأحرف المسموح بها في فترة السماح بالتعديل، وحفظ مراجعة أخرى للمنشور إذا تم تغيير المزيد (مستوى الثقة 0 و1)"
+    editing_grace_period_max_diff_high_trust: "الحد الأقصى لعدد تغييرات الأحرف المسموح بها في فترة السماح بالتعديل، مع حفظ مراجعة أخرى للمنشور إذا تم تغيير المزيد (مستوى الثقة 2 وأعلى)"
+    staff_edit_locks_post: "سيتم قفل التعديل على المنشورات إذا تم تعديلها بواسطة أعضاء فريق العمل"
+    post_edit_time_limit: "يمكن للمؤلف من مستوى الثقة 0 أو 1 تعديل منشوراته لمدة (n) دقيقة بعد النشر. اضبط القيمة على 0 لإتاحة التعديل للأبد."
+    tl2_post_edit_time_limit: "يمكن للمؤلف من مستوى الثقة 2 وأعلى تعديل منشوراته لمدة (n) دقيقة بعد النشر. اضبط القيمة على 0 لإتاحة التعديل للأبد."
     edit_history_visible_to_public: "السماح للجميع برؤية النسخ السابقة من المنشورات التي تم تعديلها. عند إيقاف هذا الإعداد، سيتمكن أعضاء الفريق فقط من رؤيتها."
     delete_removed_posts_after: "سيتم حذف المنشورات التي أزالها المؤلف بعد (n) ساعة. في حال الضبط على 0، سيتم حذف المنشورات على الفور."
     max_image_width: "أقصى عرض للصور المصغَّرة في المنشور"
     max_image_height: "أقصى ارتفاع للصور المصغَّرة في المنشور"
+    responsive_post_image_sizes: "تغيير حجم صور المعاينة المبسَّطة للسماح بالشاشات ذات كثافة النقاط العالية بنسب البكسل التالية. قم بإزالة جميع القيم لإيقاف الصور المتجاوبة."
     fixed_category_positions: "في حال تحديده، ستتمكن من ترتيب الفئات ترتيبًا ثابتًا. وإذا ألغيت تحديده، فسيتم إدراج الفئات بترتيب النشاط."
     fixed_category_positions_on_create: "في حال تحديده، سيتم الاحتفاظ بترتيب الفئات في مربع حوار إنشاء الموضوع (requires fixed_category_positions)."
     add_rel_nofollow_to_user_content: 'أضِف rel=nofollow إلى كل المحتوى الذي قدَّمه المستخدم، باستثناء الروابط الخارجية (بما في ذلك النطاقات الرئيسية). في حال تغيير ذلك، يجب عليك إعادة إنشاء جميع المنشورات باستخدام: "rake posts:rebake"'
     exclude_rel_nofollow_domains: "قائمه النطاقات التي لا ينبغي إضافة rel=nofollow إلى روابطها. سيسمح example.com تلقائيًا بالرابط sub.example.com أيضًا. ينبغي إضافة نطاق هذا الموقع كحدٍ أدنى لمساعدة زاحفات الويب في العثور على كل المحتوى. إذا كانت هناك أجزاء أخرى من موقعك الإلكتروني في نطاقات أخرى، فأضِفها أيضًا."
     post_excerpt_maxlength: "الحد الأقصى لطول مقتطف/ملخص منشور."
+    topic_excerpt_maxlength: "الحد الأقصى لطول مقتطف الموضوع/ملخص الموضوع الذي تم إنشاؤه من أول منشور في الموضوع."
     show_pinned_excerpt_mobile: "إظهار المقتطف في الموضوعات المثبَّتة فى طريقة عرض الجوَّال."
     show_pinned_excerpt_desktop: "إظهار المقتطف في الموضوعات المثبَّتة فى طريقة عرض سطح المكتب"
     post_onebox_maxlength: "الحد الأقصى لطول منشور Discourse في لوحة المعاينة بالأحرف."
     blocked_onebox_domains: "قائمة بالنطاقات التي لن يتم عرضها في لوحة المعاينة أبدًا."
+    allowed_inline_onebox_domains: "قائمة بالنطاقات التي سيتم وضعها في لوحة المعاينة في شكلٍ مصغَّر إذا تم ربطها دون عنوان"
+    enable_inline_onebox_on_all_domains: "تجاهل إعداد الموقع inline_onebox_domain_allowlist والسماح بلوحة المعاينة المضمَّنة على جميع النطاقات."
+    force_custom_user_agent_hosts: "المضيفات التي سيتم استخدام وكيل المستخدم للوحة المعاينة المخصَّصة في جميع طلباتها. (هذا الإعداد مفيد بشكلٍ خاص للمضيفات الذين تقيِّد الوصول حسب وكيل المستخدم)."
+    max_oneboxes_per_post: "الحد الأقصى لعدد لوحات المعاينة في المنشور"
+    facebook_app_access_token: "رمز يتم إنشاؤه من معرِّف تطبيق Facebook أو الرمز السري لديك. ويتم استخدامه لإنشاء لوحات معاينة لموقع Instagram."
+    logo: "صورة الشعار في الجزء العلوي الأيمن من موقعك. استخدم صورة مستطيلة عريضة بارتفاع 120 ونسبة عرض إلى ارتفاع أكبر من 3:1. وإذا تركتها فارغة، فسيتم عرض نص عنوان الموقع."
+    logo_small: "صورة الشعار الصغيرة في الجزء العلوي الأيمن من موقعك، وتظهر عند التمرير لأسفل. استخدم صورة مربعة بمقاس 120 × 120. وإذا تركتها فارغة، فسيتم عرض صورة رمزية لمنزل."
+    digest_logo: "الشعار البديل المُستخدَم أعلى ملخص البريد الإلكتروني لموقعك. استخدم صورة مستطيلية عريضة. لا تستخدم صورة SVG. وإذا تركتها فارغة، فسيتم استخدام الصورة من إعداد `logo`."
+    mobile_logo: "الشعار  المُستخدَم في إصدار الجوَّال من موقعك. استخدم صورة مستطيلية عريضة بارتفاع 120 ونسبة عرض إلى ارتفاع أكبر من 3:1. وإذا تركتها فارغة، فسيتم استخدام الصورة من إعداد `logo`."
+    logo_dark: "بديل الألوان الداكنة لإعداد الموقع `logo`"
+    logo_small_dark: "بديل الألوان الداكنة لإعداد الموقع `logo small`"
+    mobile_logo_dark: "بديل الألوان الداكنة لإعداد الموقع `mobile logo`"
+    large_icon: "الصورة المُستخدَمة كأساس لأيقونات البيانات الوصفية الأخرى. يجب أن يكون الحجم المثالي أكبر من 512 × 512. وإذا تركتها فارغة، فسيتم استخدام logo_small."
+    manifest_icon: "الصورة المُستخدَمة كشعار/صورة البداية على Android. سيتم تغيير حجمها تلقائيًا إلى 512 × 512. وإذا تركتها فارغة، فسيتم استخدام large_icon."
+    manifest_screenshots: "لقطات شاشة تعرض ميزات المثيل ووظيفته على صفحة رسالة التثبيت الخاصة به. يجب أن تكون جميع الصور من تحميلات محلية وبالأبعاد نفسها."
+    favicon: "الرمز المفضَّل لموقعك، راجع href='https://en.wikipedia.org/wiki/Favicon' target='_blank'>https://en.wikipedia.org/wiki/Favicon</a>. للعمل بشكلٍ صحيح على شبكة توصيل المحتوى، يجب أن تكون الصورة بتنسيق png. سيتم تغيير حجمها إلى 32 × 32. وإذا تركتها فارغة، فسيتم استخدام large_icon."
+    apple_touch_icon: "الصورة المُستخدَمة كشعار/صورة البداية على Android. سيتم تغيير حجمها تلقائيًا إلى 512 × 512. وإذا تركتها فارغة، فسيتم استخدام large_icon."
+    opengraph_image: "صورة opengraph افتراضية، يتم استخدامها عندما لا تحتوي الصفحة على صورة أخرى مناسبة. وإذا تركتها فارغة، فسيتم استخدام large_icon."
+    twitter_summary_large_image: "بطاقة `Twitter `summary large image' (يجب أن يكون عرضها 280 على الأقل، وارتفاعها 150 على الأقل). وإذا تركتها فارغة، فسيتم إنشاء البيانات الوصفية للبطاقة العادية باستخدام opengraph_image."
     notification_email: "عنوان البريد الإلكتروني المُستخدَم في حقل \"من:\" عند إرسال جميع رسائل النظام الأساسية. يجب ضبط سجلات SPF وDKIM وreverse PTR للنطاق المحدَّد هنا بشكلٍ صحيح لتصل الرسالة الإلكترونية."
     email_custom_headers: "قائمة مفصولة بشرائط عمودية لرؤوس البريد الإلكتروني المخصَّصة"
+    email_subject: "تنسيق موضوع قابل للتخصيص للرسائل الإلكترونية القياسية. راجع <a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801</a>"
+    detailed_404: "يوفِّر مزيدًا من التفاصيل للمستخدمين بشأن سبب عدم تمكُّنهم من الوصول إلى موضوع معيَّن. ملاحظة: هذا الإعداد أقل أمانًا لأن المستخدمين سيعرفون إذا كان عنوان URL مرتبطًا بموضوع صالح."
+    enforce_second_factor: "يفرض على المستخدمين تفعيل المصادقة الثنائية. حدِّد \"الكل\" لفرضها على جميع المستخدمين. حدِّد \"فريق العمل\" لفرضها على المستخدمين من فريق العمل فقط."
     force_https: "فرض استخدام HTTPS فقط على الموقع. تحذير: لا تفعِّل هذا الإعداد إلا بعد التأكد من أن HTTPS مُعد بالكامل ويعمل فى جميع أنحاء الموقع! هل تحقَّقت من شبكة توصيل المحتوى (CDN)، وعمليات تسجيل الدخول على جميع شبكات التواصل الاجتماعى، وأي شعارات أو تبعيات خارجية للتأكد من أنها جميعًا متوافقه مع HTTPS؟"
+    same_site_cookies: "استخدام ملفات تعريف ارتباط الموقع نفسه، فهي تقضي على جميع مؤشرات CSRF على المتصفحات المدعومة (Lax أو Strict). تحذير: سيعمل Strict فقط على المواقع التي تفرض تسجيل الدخول وتستخدم طريقة مصادقة خارجية."
     summary_score_threshold: "الحد الأدنى من النقاط المطلوبة لتضمين منشور في \"تلخيص هذا الموضوع\""
+    summary_posts_required: "الحد الأدنى من عدد المنشورات في الموضوع قبل تفعيل \"تلخيص هذا الموضوع\". سيتم تطبيق التغييرات على هذا الإعداد بأثر رجعي في غضون أسبوع."
+    summary_likes_required: "الحد الأدنى من عدد الإعجابات في الموضوع قبل تفعيل \"تلخيص هذا الموضوع\". سيتم تطبيق التغييرات على هذا الإعداد بأثر رجعي في غضون أسبوع."
     summary_percent_filter: "يظهر أعلى % من المنشورات عندما يضغط المستخدم على \"تلخيص هذا الموضوع\""
+    summary_max_results: "الحد الأقصى لعدد المنشورات التي تم إرجاعها بواسطة \"تلخيص هذا الموضوع\""
+    enable_personal_messages: "السماح للمستخدمين من مستوى الثقة 1 (قابل للإعداد عبر الحد الأدنى لمستوى الثقة لإرسال الرسائل) بإنشاء رسائل والرد على الرسائل. لاحظ أن فريق العمل يمكنه دائمًا إرسال الرسائل بغض النظر عن أي شيء."
+    enable_system_message_replies: "يسمح للمستخدمين بالرد على رسائل النظام، حتى إذا كانت الرسائل الشخصية متوقفة."
     enable_long_polling: "يمكن لناقل الرسائل المُستخدَم في الإشعارات استخدام الاستقصاء الطويل"
+    enable_chunked_encoding: "تفعيل استجابات الترميز المقسَّمة بواسطة الخادم. تعمل هذه الميزة على معظم الإعدادات، ولكن قد يتم تخزين بعض الخوادم الوكيلة مؤقتًا، مما يتسبب في تأخير الاستجابات"
     long_polling_base_url: "عنوان URL الأساسي المُستخدَم في الاستقصاء الطويل (عندما تخدم شبكة توصيل المحتوى (CDN) محتوًى ديناميكيًا، احرص على ضبط هذا على سحب الموارد من المصدر) eg: http://origin.site.com"
     long_polling_interval: "المدة الزمنية التي سينتظرها الخادم قبل الرد على العملاء عند عدم وجود أي بيانات لإرسالها (للأعضاء الذين سجَّلوا الدخول فقط)"
     polling_interval: "المدة الزمنية المفترض أن يظل العملاء الذين سجَّلوا الدخول متصلين خلالها بالمللي ثانية عندما لا يكون الاستقصاء الطويل مستخدمًا"
     anon_polling_interval: "المدة الزمنية المفترض استقصاء العملاء المجهولين خلالها بالمللي ثانية"
     background_polling_interval: "المدة الزمنية المفترض استقصاء العملاء المجهولين خلالها بالمللي ثانية (عندما تكون النافذة في الخلفية)"
+    hide_post_sensitivity: "احتمالية إخفاء المنشور الذي تم الإبلاغ عنه"
+    silence_new_user_sensitivity: "احتمالية كتم المستخدم الجديد بناءً على البلاغات عن سلوك غير مرغوب فيه"
+    auto_close_topic_sensitivity: "احتمالية إغلاق المنشور الذي تم الإبلاغ عنه تلقائيًا"
     cooldown_minutes_after_hiding_posts: "عدد الدقائق التي يجب على المستخدم انتظارها قبل أن يتمكن من تعديل منشور مخفي بسبب بلاغات المجتمع"
     max_topics_in_first_day: "أقصى عدد من الموضوعات المسموح للمستخدم إنشاؤها خلال 24 ساعة من إنشاء أول منشور."
     max_replies_in_first_day: "أقصى عدد من الردود المسموح للمستخدم إنشاؤها خلال 24 ساعة قبل إنشاء منشوره الأول"
     tl2_additional_likes_per_day_multiplier: "زيادة حد الإعجابات اليومي لمستوى الثقة 2 (عضو) عن طريق مضاعفة هذا الرقم"
     tl3_additional_likes_per_day_multiplier: "زيادة حد الإعجابات اليومي لمستوى الثقة 3 (منتظم) عن طريق مضاعفة هذا الرقم"
     tl4_additional_likes_per_day_multiplier: "زيادة حد الإعجابات اليومي لمستوى الثقة 4 (قائد) عن طريق مضاعفة هذا الرقم"
+    tl2_additional_edits_per_day_multiplier: "زيادة حد التعديلات اليومية لمستوى الثقة 2 (عضو) بالضرب في هذا الرقم"
+    tl3_additional_edits_per_day_multiplier: "زيادة حد التعديلات اليومية لمستوى الثقة 3 (منتظم) بالضرب في هذا الرقم"
+    tl4_additional_edits_per_day_multiplier: "زيادة حد التعديلات اليومية لمستوى الثقة 4 (قائد) بالضرب في هذا الرقم"
+    num_users_to_silence_new_user: "إخفاء جميع منشورات المستخدم الجديد ومنع النشر في المستقبل إذا تلقَّت منشوراته spam_flags_to_silence_new_user بلاغ عن سلوك غير مرغوب فيه من هذا العدد من المستخدمين المختلفين. اضبط القيمة على 0 للإيقاف."
+    num_tl3_flags_to_silence_new_user: "إخفاء جميع منشورات المستخدم الجديد ومنع النشر في المستقبل إذا تلقَّت منشوراته العديد من البلاغات من num_tl3_users_to_silence_new_user مستخدم مختلف من مستوى الثقة 3. اضبط القيمة على 0 للإيقاف."
+    num_tl3_users_to_silence_new_user: "إخفاء جميع منشورات المستخدم الجديد ومنع النشر في المستقبل إذا تلقَّت منشوراته num_tl3_flags_to_silence_new_user من هذا العدد من المستخدمين المختلفين من مستوى الثقة 3. اضبط القيمة على 0 للإيقاف."
+    notify_mods_when_user_silenced: "إرسال رسالة إلى جميع المشرفين إذا تم كتم الخدمة تلقائيًا"
+    flag_sockpuppets: "الإبلاغ عن منشورَين على أنهما يُحتمَل أنا يكونا غير مرغوب فيهما إذا ردَّ مستخدم جديد على موضوع من عنوان IP نفسه الذي ردَّ منه مثل المستخدم الذي بدأ الموضوع"
     traditional_markdown_linebreaks: "استخدام فواصل الأسطر التقليدية في Markdown، والتي تتطلب مسافتين في النهاية لإدراج فاصل سطر."
+    enable_markdown_typographer: "استخدام قواعد الطباعة لتحسين إمكانية قراءة النص: استبدال علامات الاقتباس المستقيمة ' بعلامات اقتباس مجعدة ’، و(c) (tm) برمزيهما، و-- بالشرطة الطويلة –، إلى آخره."
+    enable_markdown_linkify: "التعامل تلقائيًا مع النص الذي يشبه الرابط كرابط: سيتم ربط www.example.com وhttps://example.com تلقائيًا"
+    markdown_linkify_tlds: "قائمة نطاقات المستوى الأعلى التي يتم التعامل معها تلقائيًا كروابط"
+    markdown_typographer_quotation_marks: "قائمة أزواج استبدال علامات الاقتباس الزوجية والفردية"
     post_undo_action_window_mins: "عدد الدقائق المسموح فيها للأعضاء بالتراجع عن الإجراءات الأخيرة على المنشور (إعجاب، بلاغ، إلى آخره)."
+    must_approve_users: "يجب أن يوافق فريق العمل على جميع حسابات المستخدمين الجُدد قبل السماح لهم بالوصول إلى الموقع."
+    invite_code: "يجب على المستخدم كتابة هذا الرمز للسماح بتسجيل الحساب، ويتم تجاهله عندما يكون فارغًا (غير حساس لحالة الأحرف)"
+    approve_suspect_users: "إضافة المستخدمين المشبوهين إلى قائمة انتظار المراجعة. أدخل المستخدمون المشبوهون سيرة ذاتية/موقع إلكتروني ولكن ليس لديهم نشاط قراءة."
+    review_every_post: "يجب مراجعة جميع المنشورات. تحذير! لا يوصى بهذا الإعداد للمواقع المزدحمة."
+    pending_users_reminder_delay_minutes: "إرسال إشعار إلى المشرفين إذا كان المستخدمون الجُدد ينتظرون الموافقة لمدة أطول من هذا العدد من الدقائق. اضبطها على -1 لإيقاف الإشعارات."
+    persistent_sessions: "سيظل المستخدمون مسجَّلين الدخول عند إغلاق متصفح الويب"
     maximum_session_age: "سيظل المستخدم مسجَّلًا الدخول لمدة n ساعة بعد زيارته اﻷخيرة."
+    ga_version: "إصدار Google Universal Analytics الذي سيتم استخدامه: v3 (analytics.js)، v4 (gtag)"
+    ga_universal_tracking_code: "معرِّف رمز تتبُّع Google Universal Analytics، على سبيل المثال: UA-12345678-9؛ راجع <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
+    ga_universal_domain_name: "اسم نطاق Google Universal Analytics، على سبيل المثال: eg: mysite.com؛ راجع <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
+    ga_universal_auto_link_domains: "تفعيل تتبُّع Google Universal Analytics عبر النطاقات. ستتم إضافة معرِّف العميل إلى الروابط الصادرة إلى هذه النطاقات. راجع <a href='https://support.google.com/analytics/answer/1034342?hl=en' target='_blank'>دليل التتبُّع عبر النطاقات من Google.</a>"
+    gtm_container_id: "معرِّف حاوية إدارة العلامات من Google. على سبيل المثال: GTM-ABCDEF. <br/>ملاحظة: قد يلزم إدراج البرامج النصية المضمَّنة لجعة خارجية والتي تم تحميلها بواسطة GTM في قائمة السماح في `content security policy script src`."
+    enable_escaped_fragments: "ارجع إلى واجهة برمجة تطبيقات Ajax-Crawling من Google إذا لم يتم اكتشاف زاحف ويب. راجع <a href='https://developers.google.com/webmasters/ajax-crawling/docs/learn-more' target='_blank'>https://developers.google.com/webmasters/ajax-crawling/docs/learn-more</a>"
+    moderators_manage_categories_and_groups: "السماح للمشرفين بإدارة الفئات والمجموعات"
     cors_origins: "الأصول المسموح بها لطلبات الموارد متعددة المصادر (CORS). بجب أن يتضمَّن كل مصدر http:// أو https://. ويجب ضبط متغير البيئة للقيمة DISCOURSE_ENABLE_CORS على True لتفعيل CORS."
     use_admin_ip_allowlist: "لا يمكن للمسؤولين تسجيل الدخول إلا إذا كانوا على عنوان IP محدَّد في قائمة عناوين IP الخاضعة للمراقبة (المسؤول > السجلات > عناوين IP الخاضعة للمراقبة)."
+    blocked_ip_blocks: "قائمة وحدات عناوين IP الخاصة التي لا ينبغي لمنصة Discourse الزحف إليها مطلقًا"
+    allowed_internal_hosts: "قائمة المضيفات الداخلية التي يمكن لمنصة Discourse الزحف إليها بأمان من أجل لوحة المعاينة والأغراض الأخرى"
+    allowed_onebox_iframes: "قائمة نطاقات iframe src المسموح بها عبر تضمينات Onebox. سيسمح `*` بجميع محركات Onebox الافتراضية."
+    allowed_iframes: "قائمة بادئات نطاقات iframe src التي يمكن أن يسمح بها Discourse بأمان في المنشورات"
+    allowed_crawler_user_agents: "وكلاء المستخدمين لزاحفات الويب التي يجب السماح لها بالوصول إلى الموقع. تحذير! سيؤدي ضبط هذا الإعداد إلى عدم السماح بجميع الزاحفات غير المُدرَجة هنا!"
+    blocked_crawler_user_agents: "الكلمة الفريدة غير حساسة لحالة الأحرف في سلسلة وكيل المستخدم والتي تحدِّد زاحفات الويب التي لا ينبغي السماح لها بالوصول إلى الموقع. لا تنطبق إذا تم تعريف قائمة السماح."
+    slow_down_crawler_user_agents: "وكلاء المستخدمين لزاحفات الويب التي يجب أن يكون معدَّلها محدودًا في ملف robots.txt باستخدام توجيه تأخير الزحف"
+    slow_down_crawler_rate: "إذا تم تحديد slow_down_crawler_user_agents، فسيتم تطبيق هذا المعدَّل على جميع الزاحفات (عدد ثواني التأخير بين الطلبات)"
+    content_security_policy: "تفعيل Content-Security-Policy"
+    content_security_policy_report_only: "تفعيل Content-Security-Policy-Report-Only"
+    content_security_policy_collect_reports: "تفعيل جمع تقارير انتهاك سياسة أمان المحتوى في /csp_reports"
+    content_security_policy_frame_ancestors: "تقييد من يمكنه تضمين هذا الموقع في iframes عبر سياسة أمان المحتوى. يمكن التحكُّم في المضيفات المسموح بها في <a href='%{base_path}/admin/customize/embedding'>التضمين</a>"
+    content_security_policy_script_src: "مصادر النصوص الإضافية المُدرَجة في قائمة السماح. يتم تضمين المضيف الحالي وشبكة توصيل المحتوى بشكلٍ افتراضي. راجع <a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>الحد من هجمات XSS باستخدام سياسة أمان المحتوى.</a>"
+    invalidate_inactive_admin_email_after_days: "ستحتاج حسابات المسؤولين الذين لم يزوروا الموقع في هذا العدد من الأيام إلى إعادة التحقُّق من صحة عنوان بريدهم الإلكتروني قبل تسجيل الدخول. اضبط القيمة على 0 للإيقاف."
     top_menu: "تحديد العناصر التي تظهر في لوحة تنقُّل الصفحة الرئيسية، وبأي ترتيب. مثال: الجديدة|غير المقروءة|الفئات|الأكثر عرضًا|المقروءة|المنشورة|الإشارات المرجعية"
     post_menu: "تحديد العناصر التي تظهر في قائمة المنشور وترتيبها. مثال: تعديل|إبلاغ|حذف|مشاركة|إشارة مرجعية|رد"
     post_menu_hidden_items: "عناصر القائمة التي سيتم إخفاؤها افتراضيًا في قائمة المنشور ما لم يتم النقر على رمز الثلاث نقاط لتوسيع القائمة."
     share_links: "تحديد العناصر التي تظهر في مربع حوار المشاركة وترتيبها"
     site_contact_username: "اسم مستخدم صالح لفريق العمل لإرسال جميع الرسائل الآلية منه. سيتم استخدام حساب النظام الافتراضي في حال تركها خالية."
+    site_contact_group_name: "اسم مجموعة صالح ليتم دعوتها إلى جميع الرسائل الآلية"
     send_welcome_message: "إرسال رسالة ترحيبية إلى جميع المستخدمين الجُدد مع دليل البدء السريع"
+    send_tl1_welcome_message: "إرسال رسالة ترحيبية إلى المستخدمين الجُدد في مستوى الثقة 1"
+    send_tl2_promotion_message: "إرسال رسالة ترحيبية بشأن الترقية إلى المستخدمين الجُدد في مستوى الثقة 2"
     suppress_reply_directly_below: "عدم عرض عدد الردود القابل للتوسيع على منشور عندما يكون هناك رد واحد فقط أسفل هذا المنشور مباشرةً."
     suppress_reply_directly_above: "عدم عرض عبارة \"ردًا على\" القابلة للتوسيع في منشور عندما يكون هناك رد واحد فقط فوق هذا المنشور مباشرةً."
+    remove_full_quote: "إزالة الاقتباسات الكاملة تلقائيًا من الردود المباشرة"
     suppress_reply_when_quoting: "عدم عرض عبارة \"ردًا على\" القابلة للتوسيع في منشور عند اقتباس المنشور للرد."
     max_reply_history: "الحد الأقصى لعدد الردود التي سيتم توسيعها عند توسيع عبارة \"ردًا على\""
     topics_per_period_in_top_summary: "عدد الموضوعات الأكثر عرضًا في الملخص الافتراضي للموضوعات الأكثر عرضًا."
     topics_per_period_in_top_page: "عدد الموضوعات أكثر عرضًا في أهم الموضوعات في قائمة \"إظهار المزيد\" الموسَّعة للموضوعات الأكثر عرضًا."
     redirect_users_to_top_page: "إعادة توجيه المستخدمين الجُدد والغائبين لفترة طويلة تلقائيًا إلى أعلى الصفحة."
     top_page_default_timeframe: "الإطار الزمني الافتراضي لصفحة العرض من الأعلى."
+    moderators_view_emails: "السماح للمشرفين بعرض عناوين البريد الإلكتروني للمستخدمين"
+    prioritize_username_in_ux: "إظهار اسم المستخدم أولًا على صفحة المستخدم وبطاقة المستخدم والمنشورات (عند إظهار الاسم المتوقف أولًا)"
+    enable_rich_text_paste: "تفعيل التحويل التلقائي من HTML إلى Markdown عند لصق نص في أداة الإنشاء (إعداد تجريبي)"
+    send_old_credential_reminder_days: "التذكير ببيانات الاعتماد القديمة بعد عدد الأيام"
     email_token_valid_hours: "نسيت كلمة المرور/الرموز المميزة لتفعيل الحساب صالحة لمدة (n) ساعة."
     enable_badges: "تفعيل نظام الشارات"
+    max_favorite_badges: "الحد الأقصى لعدد الشارات التي يمكن للمستخدم تحديدها"
     enable_whispers: "السماح بالاتصالات الخاصة بين فريق العمل داخل الموضوعات."
+    allow_index_in_robots_txt: "حدِّد في ملف robots.txt أن هذا الموقع يسمح لمحركات بحث الويب بفهرسته. وفي حالات استثنائية، يمكنك <a href='%{base_path}/admin/customize/robots'>تجاوز ملف robots.txt</a> بشكلٍ دائم."
     blocked_email_domains: "قائمة مفصولة بشرائط عمودية لنطاقات البريد الإلكتروني التي لا يتم السماح للمستخدمين بتسجيل حسابات عليها. مثال: mailinator.com|trashmail.net"
     allowed_email_domains: "قائمة مفصولة بشرائط عمودية لنطاقات البريد الإلكتروني التي يجب على المستخدمين تسجيل حسابات عليها. تحذير: لن يتم السماح بالمستخدمين المسجَّلين على نطاقات بريد إلكتروني أخرى بخلاف المذكورة هنا!"
+    auto_approve_email_domains: "ستتم الموافقة تلقائيًا على المستخدمين الذين لديهم عناوين بريد إلكتروني من قائمة النطاقات هذه."
     hide_email_address_taken: "لا تُخبر المستخدمين بوجود حساب بعنوان البريد الإلكتروني نفسه في أثناء الاشتراك وفي نموذج نسيان كلمة المرور."
     log_out_strict: "تسجيل خروج المستخدم من جميع الجلسات على جميع الأجهزة عند تسجيل الخروج"
+    version_checks: "فحص Discourse Hub للحصول على تحديثات الإصدار وإظهار رسائل الإصدار الجديد على <a href='%{base_path}/admin' target='_blank'>/admin</a> لوحة المعلومات"
     new_version_emails: "إرسال رسالة إلكترونية إلى عنوان contact_email عند توفُّر إصدار جديد من Discourse"
     invite_expiry_days: "مدة صلاحية مفاتيح دعوة المستخدمين بالأيام"
     invite_only: "يجب أن تتم دعوة جميع المستخدمين الجُدد بشكلٍ صريح بواسطة المستخدمين الموثوق بهم أو فريق العمل. التسجيل العام متوقف."
     login_required: "طلب المصادقة لقراءة المحتوى على هذا الموقع، وعدم السماح بالوصول المجهول"
     min_username_length: "الحد الأدنى لطول اسم المستخدم بالأحرف. تحذير: إذا كان لدى أي مستخدمين أو مجموعات حالية أسماء أقصر من ذلك، فسيتعطَّل موقعك!"
+    max_username_length: "الحد الأقصى لطول اسم المستخدم بالأحرف. تحذير: إذا كان لدى أي مستخدمين أو مجموعات حالية أسماء أطول من هذا الحد، فسيتعطل موقعك!"
+    unicode_usernames: "السماح لأسماء المستخدمين وأسماء المجموعات بأن تتضمَّن حروفًا وأرقامًا بترميز Unicode"
+    allowed_unicode_username_characters: "التعبير العادي للسماح ببعض أحرف Unicode فقط في أسماء المستخدمين. سيتم السماح دائمًا بأحرف وأرقام ASCII ولا يلزم تضمينها في قائمة السماح."
+    reserved_usernames: "أسماء المستخدمين غير المسموح لهم بالاشتراك. يمكن استخدام رمز البدل * لمطابقة أي حرف صفر مرة أو أكثر."
     min_password_length: "الحد الأدنى لطول كلمة المرور."
     min_admin_password_length: "الحد الأدنى لطول كلمة المرور للمسؤول."
+    password_unique_characters: "الحد الأدنى لعدد الأحرف الفريدة التي يجب أن تتضمَّنها كلمة المرور."
     block_common_passwords: "لا تسمح بكلمات المرور الموجودة ضمن قائمة العشرة آلاف (10,000) كلمة مرور الأكثر شيوعًا."
+    auth_skip_create_confirm: تخطي النافذة المنبثقة لإنشاء حساب عند الاشتراك عبر المصادقة الخارجية. يُفضَّل استخدام هذا الإعداد جنبًا إلى جنب مع auth_overrides_email وauth_overrides_username وauth_overrides_name.
+    auth_immediately: "إعادة التوجيه تلقائيًا إلى نظام تسجيل الدخول الخارجي دون تفاعل المستخدم. يسري ذلك فقط عندما تكون القيمة login_required مضبوطة على True، ولا يوجد سوى طريقة مصادقة خارجية واحدة"
+    enable_discourse_connect: "تفعيل تسجيل الدخول عبر DiscourseConnect (المعروف سابقًا باسم \"Discourse SSO\") (تحذير: *يجب* التحقُّق من صحة عناوين البريد الإلكتروني للمستخدمين من خلال الموقع الخارجي!)"
+    verbose_discourse_connect_logging: "تسجيل تشخصيات DiscourseConnect المطوَّلة ذات الصلة في <a href='%{base_path}/logs' target='_blank'>/logs</a>"
+    enable_discourse_connect_provider: "تنفيذ بروتوكول موفِّر DiscourseConnect (المعروف سابقًا باسم \"Discourse SSO\") في نقطة نهاية /session/sso_provider، يتطلب ضبط discourse_connect_provider_secrets"
+    discourse_connect_url: "عنوان URL لنقطة نهاية DiscourseConnect (يجب أن يتضمَّن http:// أو https://)"
+    discourse_connect_secret: "السلسلة السرية المُستخدَمة لمصادقة معلومات DiscourseConnect بشكلٍ مشفَّر، تأكد من أنها تتكوَّن من 10 أحرف أو أكثر"
+    discourse_connect_provider_secrets: "قائمة بالأزواج السرية للنطاق والتي تستخدم DiscourseConnect. تأكَّد من أن طول رمز DiscourseConnect السري هو 10 أحرف أو أكثر. يمكن استخدام رمز حرف البدل * لمطابقة أي نطاق أو جزء منه فقط (على سبيل المثال، *.example.com)."
     discourse_connect_overrides_bio: "تجاوز النبذة التعريفية في الملف الشخصي للمستخدم ومنعه من تغييرها"
+    discourse_connect_overrides_groups: "مزامنة كل عضويات المجموعة اليدوية مع المجموعات المحدَّدة في سمة المجموعات (تحذير: إذا لم تحدِّد مجموعات، فسيتم مسح جميع عضويات المجموعة اليدوية للمستخدم)"
+    auth_overrides_email: "يستبدل عنوان البريد الإلكتروني المحلي بعنوان بريد إلكتروني خارجي للموقع عند كل عملية تسجيل دخول، ويمنع التغييرات المحلية. ينطبق هذا الإعداد على جميع موفِّري المصادقة. (تحذير: يمكن أن تحدث تضاربات بسبب تطبيع عناوين البريد الإلكتروني المحلية)"
+    auth_overrides_username: "يستبدل اسم المستخدم المحلي باسم مستخدم خارجي للموقع عند كل عملية تسجيل دخول، ويمنع التغييرات المحلية. ينطبق هذا الإعداد على جميع موفِّري المصادقة. (تحذير: يمكن أن تحدث تضاربات بسبب الاختلافات في طول/متطلبات اسم المستخدم)"
+    auth_overrides_name: "يستبدل الاسم الكامل المحلي باسم كامل خارجي للموقع عند كل عملية تسجيل دخول، ويمنع التغييرات المحلية. ينطبق هذا الإعداد على جميع موفِّري المصادقة."
+    discourse_connect_overrides_avatar: "يستبدل الصورة الرمزية للمستخدم بالصورة الرمزية للموقع الخارجي من حمولة DiscourseConnect. في حالة التفعيل، لن يتم السماح للمستخدمين بتحميل الصور الرمزية على Discourse."
+    discourse_connect_overrides_location: "يستبدل موقع المستخدم بموقع خارجي من حمولة DiscourseConnect ويمنع التغييرات المحلية."
+    discourse_connect_overrides_website: "يستبدل الموقع الإلكتروني للمستخدم بموقع خارجي من حمولة DiscourseConnect ويمنع التغييرات المحلية."
+    discourse_connect_overrides_profile_background: "يستبدل خلفية الملف الشخصي للمستخدم بالصورة الرمزية للموقع الخارجي من حمولة DiscourseConnect."
+    discourse_connect_overrides_card_background: "يستبدل خلفية بطاقة المستخدم بالصورة الرمزية للموقع الخارجي من حمولة DiscourseConnect."
+    discourse_connect_not_approved_url: "إعادة توجيه حسابات DiscourseConnect غير المعتمدة إلى عنوان URL هذا"
+    discourse_connect_allows_all_return_paths: "عدم تقييد نطاق return_paths الذي يقدِّمه DiscourseConnect (يجب أن يكون مسار الإرجاع الافتراضي على الموقع الحالي)"
+    enable_local_logins: "تفعيل الحسابات المحلية التي تعتمد على اسم المستخدم وكلمة المرور في تسجيل الدخول. تحذير: إذا تم إيقاف هذا الإعداد، فقد لا تتمكن من تسجيل الدخول إذا كنت لم تُعدَّ مسبقًا طريقة تسجيل دخول بديلة واحدة على الأقل."
+    enable_local_logins_via_email: "السماح للمستخدمين بطلب رابط تسجيل الدخول بنقرة واحدة ليتم إرساله إليهم عبر البريد الإلكتروني"
     allow_new_registrations: "السماح بعمليات تسجيل جديدة من المستخدمين. يمكنك إلغاء تحديد هذا الإعداد لمنع أي شخص من إنشاء حساب جديد."
     enable_signup_cta: "إظهار إشعار للمستخدمين المجهولين العائدين تطالبهم بالاشتراك للحصول على حساب."
+    enable_google_oauth2_logins: "تفعيل مصادقة Google Oauth2. هذه هي طريقة المصادقة التي تدعمها Google حاليًا. وتتطلب مفتاحًا ورمزًا سريًا. راجع <a href='https://meta.discourse.org/t/15858' target='_blank'>إعداد تسجيل الدخول عبر Google لمنصة Discourse</a>."
     google_oauth2_client_id: "معرِّف العميل لتطبيق Google"
     google_oauth2_client_secret: "الرمز السري للعميل لتطبيق Google"
+    google_oauth2_prompt: "قائمة اختيارية مفصولة بمسافات لقيم السلسلة والتي تحدِّد ما إذا كان خادم التفويض يطالب المستخدم بإعادة المصادقة والموافقة. راجع <a href='https://developers.google.com/identity/protocols/OpenIDConnect#prompt' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#prompt</a> لمعرفة القيم الممكنة."
+    google_oauth2_hd: "نطاق Google Apps Hosted اختياري والذي سيقتصر تسجيل الدخول عليه. راجع <a href='https://developers.google.com/identity/protocols/OpenIDConnect#hd-param' target='_blank'>https://developers.google.com/identity/protocols/OpenIDConnect#hd-param</a> لمزيد من التفاصيل."
+    enable_twitter_logins: "تفعيل مصادقة Twitter، يتطلب twitter_consumer_key وtwitter_consumer_secret. راجع <a href='https://meta.discourse.org/t/13395' target='_blank'>إعداد تسجيل الدخول عبر Twitter (والتضمينات الغنية) لمنصة </a>Discourse."
+    twitter_consumer_key: "مفتاح العميل لمصادقة Twitter، مسجَّل على <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
+    twitter_consumer_secret: "الرمز السري للعميل لمصادقة Twitter، مسجَّل على <a href='https://developer.twitter.com/apps' target='_blank'>https://developer.twitter.com/apps</a>"
+    enable_facebook_logins: "تفعيل مصادقة Facebook، يتطلب facebook_app_id وfacebook_app_secret. راجع <a href='https://meta.discourse.org/t/13394' target='_blank'>إعداد تسجيل الدخول عبر Facebook لمنصة Discourse</a>."
+    facebook_app_id: "معرِّف التطبيق لمصادقة Facebook والمشاركة عليه، مسجَّل على <a href='https://developers.facebook.com/apps/' target='_blank'>https://developers.facebook.com/apps</a>"
+    facebook_app_secret: "الرمز السري للتطبيق لمصادقة Facebook، مسجَّل على <a href='https://developers.facebook.com/apps/' target='_blank'>https://developers.facebook.com/apps</a>"
+    enable_github_logins: "تفعيل مصادقة GitHub، يتطلب github_client_id وgithub_client_secret. راجع <a href='https://meta.discourse.org/t/13745' target='_blank'>إعداد تسجيل الدخول عبر GitHub لمنصة Discourse</a>."
+    github_client_id: "معرِّف العميل لمصادقة GitHub، مسجَّل في <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
+    github_client_secret: "الرمز السري للعميل لمصادقة GitHub، مسجَّل في <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
+    enable_discord_logins: "هل تسمح للمستخدمين بالمصادقة باستخدام Discord؟"
+    discord_client_id: 'معرِّف عميل Discord (هل تحتاج إلى واحد؟ تفضَّل بزيارة <a href="https://discordapp.com/developers/applications/me">بوابطة مطوِّري Discord</a>)'
+    discord_secret: "المفتاح السري لمنصة Discord"
+    discord_trusted_guilds: 'السماح لأعضاء خوادم Discord هذه فقط بتسجيل الدخول عبر Discord. استخدم المعرِّف الرقمي للخادم. لمزيد من المعلومات، راجع الإرشادات <a href="https://meta.discourse.org/t/configuring-discord-login-for-discourse/127129">هنا</a>. اتركه فارغًا للسماح بأي خادم.'
+    enable_backups: "السماح للمسؤولين بإنشاء نسخ احتياطية من المنتدى"
     maximum_backups: "الحد الأقصى من النسخ الاحتياطية التي يجب الاحتفاظ بها على القرص. يتم حذف النسخ الاحتياطية القديمة تلقائيًا"
     automatic_backups_enabled: "تشغيل النسخ الاحتياطية التلقائية كما هو محدَّد في تردد النسخ الاحتياطي"
+    backup_frequency: "عدد الأيام بين النسخ الاحتياطية"
     s3_backup_bucket: "الحاوية البعيدة للاحتفاظ بالنسخ الاحتياطية. تحذير: تأكد من أنها حاوية خاصة."
+    s3_endpoint: "يمكن تعديل نقطة النهاية للنسخ الاحتياطي إلى خدمة متوافقة مع S3، مثل DigitalOcean Spaces أو Minio. تحذير: اتركه فارغًا في حالة استخدام AWS S3."
+    s3_configure_tombstone_policy: "تفعيل سياسة الحذف التلقائي للتحميلات التي تم حذفها من الدليل ولم تتم إزالتها من قاعدة البيانات. مهم: إذا تم إيقاف هذا الإعداد، فلن تتم استعادة أي مساحة بعد حذف التحميلات."
+    s3_disable_cleanup: "منع إزالة النسخ الاحتياطية القديمة من S3 عندما يكون هناك نسخ احتياطية أكثر من الحد الأقصى المسموح به"
+    enable_s3_inventory: "إنشاء التقارير والتحقُّق من التحميلات باستخدام تخزين Amazon S3. مهم: يتطلب بيانات اعتماد S3 صالحة (كلٌ من معرِّف مفتاح الوصول ومفتاح الوصول السري)."
     backup_time_of_day: "الوقت من اليوم (بالتوقيت العالمي الموحَّد) الذي يجب أن يتم فيه النسخ الاحتياطي"
     backup_with_uploads: "تضمين عمليات التحميل في النسخ الاحتياطية المجدولة. سيؤدي إيقاف هذا الإعداد إلى نسخ قاعدة البيانات احتياطيًا فقط."
+    backup_location: "موقع تخزين النسخ الاحتياطية. هام: يتطلب S3 إدخال بيانات اعتماد S3 صالحة في إعدادات الملفات."
+    backup_gzip_compression_level_for_uploads: "مستوى ضغط Gzip المُستخدَم لضغط التحميلات"
+    include_thumbnails_in_backups: "تضمين الصور المصغَّرة التي تم إنشاؤها في النسخ الاحتياطية. سيؤدي إيقاف هذا الإعداد إلى جعل النسخ الاحتياطية أصغر حجمًا، ولكنه يتطلب إنشاء جميع المنشورات بعد الاستعادة."
     active_user_rate_limit_secs: "عدد مرات تحديث حقل \"last_seen_at\" بالثواني"
     verbose_localization: "عرض نصائح موسَّعة بشأن الترجمة في واجهة المستخدم"
     previous_visit_timeout_hours: "مدة الزيارة قبل أن نعتبرها الزيارة \"السابقة\"، بالساعات"
+    top_topics_formula_log_views_multiplier: "قيمة مُضاعِف (n) مرات عرض السجل في معادلة الموضوعات الأكثر عرضًا: `log(views_count) * (n) + op_likes_count * 0.5 + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
+    top_topics_formula_first_post_likes_multiplier: "قيمة مُضاعِف الإعجابات على أول منشور (n) في معادلة الموضوعات الأكثر عرضًا: `log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
+    top_topics_formula_least_likes_per_post_multiplier: "قيمة أقل عدد من الإعجابات لكل مُضاعِف منشورات (n) في معادلة الموضوعات الأكثر عرضًا: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
+    enable_safe_mode: "السماح للمستخدمين بالدخول إلى الوضع الآمن لتصحيح أخطاء المكوِّنات الإضافية"
     rate_limit_create_topic: "بعد إنشاء موضوع، يجب على المستخدمين الانتظار (n) ثانية قبل إنشاء موضوع آخر."
     rate_limit_create_post: "بعد النشر، يجب على المستخدمين الانتظار (n) ثانية قبل إنشاء منشور آخر."
     rate_limit_new_user_create_topic: "بعد إنشاء موضوع، يجب على المستخدمين الجُدد الانتظار (n) ثانية قبل إنشاء موضوع آخر."
@@ -1096,21 +1855,53 @@ ar:
     max_bookmarks_per_day: "الحد الأقصى اليومي للإشارات المرجعية لكل مستخدم"
     max_edits_per_day: "الحد الأقصى اليومي للتعديلات لكل مستخدم"
     max_topics_per_day: "الحد الأقصى اليومي لعدد الموضوعات التي يمكن للمستخدم إنشاؤها."
+    max_personal_messages_per_day: "الحد الأقصى لعدد موضوعات الرسائل الشخصية الجديدة التي يمكن للمستخدم إنشاؤها يوميًا"
     max_invites_per_day: "الحد الأقصى اليومي للدعوات التي يمكن للمستخدم إرسالها"
     max_topic_invitations_per_day: "الحد الأقصى لعدد الدعوات إلى الموضوعات التي يمكن للمستخدم إرسالها يوميًا"
+    max_logins_per_ip_per_hour: "الحد الأقصى لعدد عمليات تسجيل الدخول المسموح بها لكل عنوان IP في الساعة"
+    max_logins_per_ip_per_minute: "الحد الأقصى لعدد عمليات تسجيل الدخول المسموح بها لكل عنوان IP في الدقيقة"
+    max_post_deletions_per_minute: "الحد الأقصى لعدد المنشورات التي يمكن للمستخدم حذفها في الدقيقة. اضبط القيمة على 0 لإيقاف عمليات حذف المنشورات."
+    max_post_deletions_per_day: "الحد الأقصى لعدد المنشورات التي يمكن للمستخدم حذفها يوميًا. اضبط القيمة على 0 لإيقاف عمليات حذف المنشورات."
+    invite_link_max_redemptions_limit: "لا يمكن أن يتجاوز الحد الأقصى لعمليات الاسترداد المسموح بها لروابط الدعوة هذه القيمة."
+    invite_link_max_redemptions_limit_users: "لا يمكن أن يتجاوز الحد الأقصى لعمليات الاسترداد المسموح بها لروابط الدعوة التي تم إنشاؤها بواسطة مستخدمين عاديين هذه القيمة."
     alert_admins_if_errors_per_minute: "عدد الأخطاء في الدقيقة لظهور تنبيه للمسؤول. تعطِّل القيمة \"0\" هذه الميزة. ملاحظة: تتطلَّب إعادة التشغيل."
+    alert_admins_if_errors_per_hour: "عدد الأخطاء في الساعة لتشغيل تنبيه المسؤول. يؤدي ضبط القيمة على 0 إلى إيقاف هذه الميزة. ملاحظة: يتطلب إعادة التشغيل."
+    categories_topics: "عدد الموضوعات التي سيتم عرضها في صفحة /categories. إذا تم ضبطها على 0، فستتم محاولة العثور على قيمة تلقائيًا للحفاظ على تناسق العمودين (الفئات والموضوعات)."
     suggested_topics: "عدد الموضوعات المقترحة التي تظهر أسفل الموضوع"
     limit_suggested_to_category: "عرض الموضوعات من الفئة الحالية فقط في الموضوعات المقترحة"
     suggested_topics_max_days_old: "يجب ألا يزيد عمر الموضوعات المقترحة عن n من الأيام."
+    suggested_topics_unread_max_days_old: "يجب ألا يزيد عمر الموضوعات غير المقروءة المُقترَحة عن n يوم."
     clean_up_uploads: "إزالة التحميلات المعزولة غير المرجعية لمنع الاستضافة غير القانونية. تحذير: قد ترغب في عمل نسخة احتياطية من دليل /uploads قبل تفعيل هذا الإعداد."
     clean_orphan_uploads_grace_period_hours: "فترة السماح (بالساعات) قبل إزالة تحميل معزول"
     purge_deleted_uploads_grace_period_days: "فترة السماح (بالأيام) قبل مسح تحميل محذوف"
+    purge_unactivated_users_grace_period_days: "فترة السماح (بالأيام) قبل حذف المستخدم الذي لم ينشِّط حسابه. اضبط القيمة على 0 لعدم مسح المستخدمين الذين لم يتم تنشيط حساباتهم أبدًا."
     enable_s3_uploads: "وضع التحميلات على مساحة تخزين Amazon S3. مهم: يتطلب ذلك بيانات اعتماد S3 صالحة (معرِّف مفتاح الوصول ومفتاح الوصول السري)."
+    s3_use_iam_profile: 'استخدام <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html">ملف تعريف مثيل </a>AWS EC2 لمنح الوصول إلى حاوية S3. ملاحظة: يتطلب تفعيل ذلك تشغيل Discourse في مثيل EC2 مهيَّأ بشكلٍ مناسب، ويتجاوز إعدادات "s3 access key id" و"s3 secret access key".'
     s3_upload_bucket: "اسم حاوية Amazon S3 التي سيتم تحميل الملفات إليها. تحذير: يجب كتابة الاسم بأحرف صغيرة بلا نقاط أو شرطات سفلية."
+    s3_access_key_id: "معرِّف مفتاح وصول خدمة Amazon S3 الذي سيتم استخدامه لتحميل الصور والمرفقات والنسخ الاحتياطية"
+    s3_secret_access_key: "مفتاح الوصول السري لخدمة Amazon S3 الذي سيتم استخدامه لتحميل الصور والمرفقات والنسخ الاحتياطية"
+    s3_region: "اسم منطقة خدمة Amazon S3 الذي سيتم استخدامه لتحميل الصور والنسخ الاحتياطية"
     s3_cdn_url: "عنوان URL لشبكة توصيل المحتوى (CDN) الذي سيتم استخدامه لجميع أصول s3 (على سبيل المثال: https://cdn.somewhere.com). تحذير: بعد تغيير هذا الإعداد، يجب عليك إعادة إنشاء جميع المنشورات القديمة."
     avatar_sizes: "قائمة بأحجام الصور الرمزية التي يتم إنشاؤها تلقائيًا"
     external_system_avatars_enabled: "استخدام خدمة خارجية لصور النظام"
+    external_system_avatars_url: "عنوان URL لخدمة الصور الرمزية الخارجية للنظام. الاستبدالات المسموح بها هي {username} {first_letter} {color} {size}"
+    external_emoji_url: "عنوان URL للخدمة الخارجية لصور الرموز التعبيرية. اتركه فارغًا للإيقاف."
+    use_site_small_logo_as_system_avatar: "استخدام شعار الموقع الصغير بدلًا من الصورة الرمزية لمستخدم النظام. يتطلب وجود الشعار."
+    restrict_letter_avatar_colors: "قائمة بقيم الألوان السداسية العشرية المكوَّنة من 6 أرقام لاستخدامها في خلفية الصورة الرمزية لحرف الاسم"
+    selectable_avatars_enabled: "فرض اختيار المستخدمين لصورة رمزية من القائمة"
+    selectable_avatars: "قائمة الصور الرمزية التي يمكن للمستخدمين الاختيار منها"
     allow_all_attachments_for_group_messages: "السماح بجميع مرفقات البريد الإلكتروني لرسائل المجموعات"
+    png_to_jpg_quality: "جودة ملف JPG المحوَّل (1 هي أقل جودة، و99 هي أفضل جودة، و100 للإيقاف)"
+    recompress_original_jpg_quality: "جودة ملفات الصور المحمَّلة (1 هي أقل جودة، و99 هي أفضل جودة، و100 للإيقاف)"
+    image_preview_jpg_quality: "جودة ملفات الصورة التي تم تغيير حجمها (1 هي أقل جودة، و99 هي أفضل جودة، و100 للإيقاف)"
+    allow_staff_to_upload_any_file_in_pm: "السماح لأعضاء فريق العمل بتحميل أي ملفات في الرسائل الخاصة"
+    strip_image_metadata: "إزالة البيانات الوصفية للصور"
+    composer_media_optimization_image_enabled: "يسمح بتفعيل تحسين الوسائط من جانب العميل لملفات الصور التي تم تحميلها."
+    composer_media_optimization_image_resize_dimensions_threshold: "الحد الأدنى لعرض الصورة لتشغيل تغيير الحجم من جانب العميل"
+    composer_media_optimization_image_resize_width_target: "سيتم تغيير حجم الصور التي يزيد عرضها عن `composer_media_optimization_image_dimensions_resize_threshold` إلى هذا العرض. يجب أن تكون أكبر من أو تساوي `composer_media_optimization_image_dimensions_resize_threshold`."
+    composer_media_optimization_image_encode_quality: "جودة ترميز JPEG المُستخدَم في عملية إعادة الترميز"
+    min_ratio_to_crop: "النسبة المُستخدَمة لاقتصاص الصور الطويلة. أدخل نتيجة العرض/الارتفاع."
+    simultaneous_uploads: "أقصى عدد من الملفات التي يمكن سحبها وإسقاطها في أداة الإنشاء"
     default_invitee_trust_level: "مستوى الثقة الافتراضي (0-4) للمستخدمين المدعوين"
     default_trust_level: "مستوى الثقة الافتراضي (0-4) لجميع المستخدمين الجُدد. تحذير! سيؤدي تغيير هذا الإعداد إلى تعريضك لخطر جسيم بالتعرُّض لسلوك غير مرغوب فيه."
     tl1_requires_topics_entered: "عدد الموضوعات التي يجب على المستخدم الجديد إدخالها قبل الترقية إلى مستوى الثقة 1"
@@ -1123,36 +1914,72 @@ ar:
     tl2_requires_likes_received: "عدد الإعجابات التي يجب أن يتلقاها المستخدم قبل الترقية إلى مستوى الثقة 2"
     tl2_requires_likes_given: "عدد الإعجابات التي يجب على المستخدم تسجيلها قبل الترقية إلى مستوى الثقة 2"
     tl2_requires_topic_reply_count: "عدد الموضوعات التي يجب على المستخدم الرد عليها قبل الترقية إلى مستوى الثقة 2"
+    tl3_time_period: "الفترة الزمنية المطلوبة للوصول إلى مستوى الثقة 3 (بالأيام)"
+    tl3_requires_days_visited: "الحد الأدنى لعدد الأيام التي يحتاجها المستخدم لزيارة الموقع في آخر (الفترة الزمنية المطلوبة للوصول إلى مستوى الثقة 3) يوم للتأهُّل للترقية إلى مستوى الثقة 3. اضبطها على فترة زمنية أعلى من الفترة الزمنية المطلوبة للوصول إلى مستوى الثقة 3 لإيقاف الترقيات إلى مستوى الثقة 3. (0 أو أعلى)"
+    tl3_requires_topics_replied_to: "الحد الأدنى لعدد الموضوعات التي يحتاج المستخدم إلى الرد عليها في آخر (الفترة الزمنية المطلوبة للوصول إلى مستوى الثقة 3) يوم للتأهُّل للترقية إلى مستوى الثقة 3 (0 أو أعلى)"
+    tl3_requires_topics_viewed: "النسبة المئوية للموضوعات التي تم إنشاؤها في آخر (الفترة الزمنية المطلوبة للوصول إلى مستوى الثقة 3) يوم للتأهُّل للترقية إلى مستوى الثقة 3 (0 إلى 100)"
+    tl3_requires_topics_viewed_cap: "أقصى عدد مطلوب من الموضوعات التي تم عرضها في آخر (الفترة الزمنية المطلوبة للوصول إلى مستوى الثقة 3) يوم"
+    tl3_requires_posts_read: "النسبة المئوية للمنشورات التي تم إنشاؤها في آخر (الفترة الزمنية المطلوبة للوصول إلى مستوى الثقة 3) يوم والتي يحتاج المستخدم إلى عرضها للتأهُّل للترقية إلى مستوى الثقة 3 (0 إلى 100)"
+    tl3_requires_posts_read_cap: "العدد الأقصى المطلوب من المنشورات التي تمت قراءتها في آخر (الفترة الزمنية المطلوبة للوصول إلى مستوى الثقة 3)"
     tl3_requires_topics_viewed_all_time: "الحد الأدنى لإجمالي عدد الموضوعات التي يجب على المستخدم عرضها للتأهل إلى مستوى الثقة 3"
     tl3_requires_posts_read_all_time: "الحد الأدنى لإجمالي عدد المنشورات التي يجب على المستخدم قراءتها للتأهل إلى مستوى الثقة 3"
+    tl3_requires_max_flagged: "يجب ألا يكون المستخدم قد تلقى بلاغات من x مستخدم مختلف على أكثر من x منشور في آخر (الفترة الزمنية المطلوبة للوصول إلى مستوى الثقة 3) يوم للتأهُّل للترقية إلى مستوى الثقة 3، حيث تكون x هي قيمة هذا الإعداد .(0 أو أعلى)"
     tl3_promotion_min_duration: "الحد الأدنى لعدد الأيام التي تستمر فيها الترقية إلى مستوى الثقة 3 قبل خفض رتبة المستخدم مرة أخرى إلى مستوى الثقة 2"
+    tl3_requires_likes_given: "الحد الأدنى لعدد الإعجابات التي يجب منحها في آخر (الفترة الزمنية المطلوبة للوصول إلى مستوى الثقة 3) للتأهُّل للترقية إلى مستوى الثقة 3"
+    tl3_requires_likes_received: "الحد الأدنى لعدد الإعجابات التي يجب تلقيها في آخر (الفترة الزمنية المطلوبة للوصول إلى مستوى الثقة 3) يوم للتأهُّل للترقية إلى مستوى الثقة 3"
     tl3_links_no_follow: "عدم إزالة rel=nofollow من الروابط المنشورة بواسطة مستخدمين من مستوى الثقة 3"
+    trusted_users_can_edit_others: "السماح للمستخدمين من مستويات الثقة العالية بتعديل محتوى المستخدمين الآخرين"
     min_trust_to_create_topic: "الحد الأدنى لمستوى الثقة المطلوب لإنشاء موضوع جديد"
+    allow_flagging_staff: "في حال التفعيل، يمكن للمستخدمين الإبلاغ عن المنشورات من حسابات فريق العمل."
     min_trust_to_edit_wiki_post: "الحد الأدنى لمستوى الثقة المطلوب لتعديل منشور من نوع Wiki."
     min_trust_to_edit_post: "الحد الأدنى لمستوى الثقة المطلوب لتعديل المنشورات."
     min_trust_to_allow_self_wiki: "الحد الأدنى لمستوى الثقة المطلوب لتحويل منشور المستخدم إلى Wiki."
+    min_trust_to_send_messages: "الحد الأدنى لمستوى الثقة المطلوب لإنشاء رسائل خاصة جديدة"
+    min_trust_to_send_email_messages: "الحد الأدنى لمستوى الثقة المطلوب لإرسال رسائل خاصة عبر البريد الإلكتروني"
+    min_trust_to_flag_posts: "الحد الأدنى لمستوى الثقة المطلوب للإبلاغ عن المنشورات"
+    min_trust_to_post_links: "الحد الأدنى لمستوى الثقة المطلوب لتضمين الروابط في المنشورات"
+    min_trust_to_post_embedded_media: "الحد الأدنى لمستوى الثقة المطلوب لتضمين عناصر الوسائط في المنشور"
+    min_trust_level_to_allow_profile_background: "الحد الأدنى لمستوى الثقة المطلوب لتحميل خلفية للملف الشخصي"
+    min_trust_level_to_allow_user_card_background: "الحد الأدنى لمستوى الثقة المطلوب لتحميل خلفية لبطاقة المستخدم"
+    min_trust_level_to_allow_invite: "الحد الأدنى لمستوى الثقة المطلوب لدعوة المستخدمين"
+    min_trust_level_to_allow_ignore: "الحد الأدنى لمستوى الثقة المطلوب لتجاهل المستخدمين"
+    allowed_link_domains: "النطاقات التي قد يربطها المستخدمون حتى إذا لم يكن لديهم مستوى الثقة الصحيح لنشر الروابط"
     newuser_max_links: "عدد الروابط التي يمكن للمستخدم الجديد إضافتها إلى المنشور"
+    newuser_max_embedded_media: "عدد عناصر الوسائط المضمَّنة التي يمكن لمستخدم جديد إضافتها إلى المنشور"
     newuser_max_attachments: "عدد المرفقات التي يمكن للمستخدم الجديد إضافتها إلى المنشور"
     newuser_max_mentions_per_post: "الحد الأقصى لعدد إشعارات @name التي يمكن لمستخدم جديد استخدامها في المنشور"
     newuser_max_replies_per_topic: "الحد الأقصى لعدد الردود التي يمكن لمستخدم جديد إجراؤها في موضوع واحد حتى يرد عليها شخص ما"
     max_mentions_per_post: "الحد الأقصى لعدد إشعارات @name التي يمكن لأي شخص استخدامها في المنشور"
+    max_users_notified_per_group_mention: "الحد الأقصى لعدد المستخدمين الذين قد يتلقون إشعارًا إذا تمت الإشارة إلى المجموعة (لن يتم إرسال الإشعارات إذا تم استيفاء الحد الأقصى)"
+    enable_mentions: "السماح للمستخدمين بالإشارة إلى مستخدمين آخرين"
     create_thumbnails: "إنشاء صور مصغَّرة وصور مبسَّطة أكبر من أن تلائم المنشور"
     email_time_window_mins: "الانتظار (n) دقيقة قبل إرسال أي إشعارات عبر البريد الإلكتروني لمنح المستخدمين فرصة لتعديل منشوراتهم والانتهاء منها"
+    personal_email_time_window_seconds: "الانتظار (n) ثانية قبل إرسال أي إشعارات عبر البريد الإلكتروني بالرسائل الخاصة لمنح المستخدمين فرصة لتعديل رسائلهم والانتهاء منها"
     email_posts_context: "عدد الردود السابقة التي سيتم تضمينها كسياق في إشعارات البريد الإلكتروني"
     flush_timings_secs: "عدد مرات إرسال بيانات التوقيت إلى الخادم، بالثواني."
     title_max_word_length: "الحد الأقصى لطول الكلمة المسموح به، بالأحرف، في عنوان الموضوع"
     title_min_entropy: "الحد الأدنى للإنتروبيا (يتم احتساب الحروف الفريدة وغير الإنجليزية بأكثر من عددها) المطلوبة لعنوان الموضوع"
     body_min_entropy: "الحد الأدنى للإنتروبيا (يتم احتساب الحروف الفريدة وغير الإنجليزية بأكثر من عددها) المطلوبة لنص الموضوع"
     allow_uppercase_posts: "السماح بجميع بكتابة عنوان الموضوع أو نص المنشور بأكمله بأحرف كبيرة"
+    max_consecutive_replies: "عدد المنشورات التي يجب على المستخدم إنشاؤها على التوالي في موضوع قبل منعه من إضافة رد آخر"
+    enable_filtered_replies_view: 'يؤدي الزر "(n) رد" إلى طي جميع المنشورات الأخرى وعرض المنشور الحالي والردود عليه فقط.'
+    title_fancy_entities: "تحويل أحرف ASCII الشائعة إلى كيانات HTML خيالية في عناوين الموضوعات، مثل <a href='https://daringfireball.net/projects/smartypants/' target='_blank'>https://daringfireball.net/projects/smartypants/</a>"
     min_title_similar_length: "الحد الأدنى لطول العنوان قبل التحقُّق من وجود موضوعات مشابهة"
     desktop_category_page_style: "النمط المرئي لصفحة /categories"
     category_colors: "قائمة بقيم الألوان السداسية العشرية المسموح بها للفئات"
     category_style: "النمط المرئي لشارات الفئة"
+    default_dark_mode_color_scheme_id: "نظام الألوان المُستخدَم في الوضع الداكن"
     dark_mode_none: "لا يوجد"
+    max_image_size_kb: "أقصى حجم لتحميل الصور بالكيلوبايت. يجب إعداد هذا في nginx (client_max_body_size)/apache أو proxy أيضًا. سيتم تغيير حجم الصور الأكبر من هذا والأصغر من client_max_body_size لتلائم التحميل."
     max_attachment_size_kb: "أقصى حجم لتحميل ملفات المرفقات بالكيلوبايت. يجب إعداد ذلك في nginx (client_max_body_size)/apache أو proxy أيضًا."
     authorized_extensions: "قائمة بامتدادات الملفات المسموح بتحميلها (استخدم \"*\" للسماح بجميع أنواع الملفات)"
+    authorized_extensions_for_staff: "قائمة بامتدادات الملفات المسموح بتحميلها للمستخدمين من فريق العمل، بالإضافة إلى القائمة المحدَّدة في إعداد الموقع `authorized_extensions`. (استخدم `*` لتفعيل جميع أنواع الملفات)"
+    theme_authorized_extensions: "قائمة بامتدادات الملفات المسموح بها لتحميلات السمات (استخدم \"*\" لتفعيل جميع أنواع الملفات)"
     max_similar_results: "عدد الموضوعات المشابهة التي يجب إظهارها فوق المحرِّر عند إنشاء موضوع جديد. تستند المقارنة إلى العنوان والنص."
+    max_image_megapixels: "الحد الأقصى لعدد الميغابكسل المسموح به للصورة. سيتم رفض الصور التي تحتوي على عدد أكبر من الميغابكسل."
     title_prettify: "منع الأخطاء الإملائية والأخطاء الشائعة في العناوين، بما في ذلك الكتابة بأحرف كبيرة أو كتابة الأحرف الاستهلالية للكلمات بأحرف صغيرة أو تكرار ! و؟، أو وضع . إضافية في النهاية، إلى آخره."
+    title_remove_extraneous_space: "إزالة المسافات الموجودة قبل علامات الترقيم في نهايات الجمل"
+    automatic_topic_heat_values: 'تحديث إعدادات `topic views heat` و`topic post like heat` بناءً على نشاط الموقع'
     topic_views_heat_low: "يتم تمييز حقل مرات العرض بشكلٍ طفيف بعد هذا العدد من مرات العرض."
     topic_views_heat_medium: "يتم تمييز حقل مرات العرض بشكلٍ متوسط بعد هذا العدد من مرات العرض."
     topic_views_heat_high: "يتم تمييز حقل مرات العرض بقوة بعد هذا العدد من مرات العرض."
@@ -1168,7 +1995,10 @@ ar:
     faq_url: "إذا كان لديك صفحة أسئلة شائعة مستضافة في مكانٍ آخر وتريد استخدامها، فأدخِل عنوان URL لها كاملًا هنا."
     tos_url: "إذا كان لديك مستند شروط خدمة مستضاف في مكانٍ آخر وتريد استخدامه، فأدخِل عنوان URL له كاملًا هنا."
     privacy_policy_url: "إذا كان لديك مستند مستضاف في مكان آخر لسياسة الخصوصية وتريد استخدامه، فأدخِل عنوان URL الكامل هنا."
+    log_anonymizer_details: " تحديد ما إذا كان سيتم الاحتفاظ بتفاصيل المستخدم في السجل بعد إخفاء هويته أم لا. ستحتاج إلى إيقاف تشغيل هذا الإعداد عند الامتثال للقانون العام لحماية البيانات (GDPR)."
+    newuser_spam_host_threshold: "عدد المرات التي يمكن فيها لمستخدم جديد نشر رابط للمضيف نفسه ضمن منشورات `newuser_spam_host_threshold` قبل اعتبارها غير مرغوب فيها"
     allowed_spam_host_domains: "قائمة بالنطاقات المستبعدة من اختبار المضيف غير المرغوب فيه. لن يتم تقييد المستخدمين الجُدد أبدًا من إنشاء منشورات تحتوي على روابط إلى هذه النطاقات."
+    staff_like_weight: "الأهمية التي يجب منحها لإعجابات فريق العمل (تساوي أهمية الإعجابات من غير فريق العمل 1)"
     topic_view_duration_hours: "عد مرة عرض الموضوع الجديد مرة واحدة لكل IP/مستخدم كل N ساعة"
     user_profile_view_duration_hours: "عد عرض الملف الشخصي للمستخدم الجديد مرة واحدة لكل IP/مستخدم كل N ساعة"
     levenshtein_distance_spammer_emails: "عدد الأحرف المختلفة الذي سيسمح بمطابقة جزئية عند مطابقة الرسائل الإلكترونية غير المرغوب فيها"
@@ -1177,82 +2007,221 @@ ar:
     max_age_unmatched_emails: "حذف إدخالات البريد الإلكتروني الخاضعة للمراقبة غير المتطابقة بعد (N) يوم"
     max_age_unmatched_ips: "حذف إدخالات عناوين IP الخاضعة للمراقبة غير المتطابقة بعد (N) يوم"
     num_flaggers_to_close_topic: "الحد الأدنى لعدد البلاغات المطلوب لإيقاف موضوع مؤقتًا للتدخل"
+    num_hours_to_close_topic: "عدد الساعات المطلوبة لإيقاف موضوع مؤقتًا للتدخل"
     auto_respond_to_flag_actions: "تفعيل الرد التلقائي عند تجاهل بلاغ"
     min_first_post_typing_time: "الحد الأدنى للمدة الزمنية التي يجب على المستخدم الكتابة خلالها بالمللي ثانية، إذا لم يتم استيفاء الحد، فسيدخل المنشور تلقائيًا في قائمة انتظار الموافقة. اضبطها على 0 للإيقاف (لا يوصى بذلك)"
+    auto_silence_fast_typers_on_first_post: "كتم المستخدمين الذين لا يلتزمون بمدة min_first_post_typing_time تلقائيًا"
+    auto_silence_fast_typers_max_trust_level: "الحد الأقصى لمستوى الثقة المطلوب لكتم أصحاب الطباعة السريعة تلقائيًا"
+    auto_silence_first_post_regex: "التعبير العادي غير الحساس لحالة الأحرف الذي إذا تم تمريره سيؤدي إلى كتم أول منشور بواسطة المستخدم وإرساله إلى قائمة انتظار الموافقة. مثال: ستؤدي كتابة raging|a[bc]a إلى كتم جميع المنشورات التي تتضمَّن raging أو aba أو aca في البداية. ينطبق ذلك على أول منشور فقط. تم إيقافه: استخدم \"كتم الكلمات المُراقَبة\" بدلًا منه."
+    reviewable_claiming: "هل يجب المطالبة بالمحتوى القابل للمراجعة قبل اتخاذ إجراء بشأنه؟"
+    reviewable_default_topics: "عرض المحتوى القابل للمراجعة مُجمَّعًا حسب الموضوع بشكلٍ افتراضي"
+    reviewable_default_visibility: "عدم عرض العناصر القابلة للمراجعة ما لم تستوفي هذه الأولوية"
+    reviewable_low_priority_threshold: "يخفي عامل تصفية الأولوية العناصر القابلة للمراجعة التي لا تحقِّق هذا العدد من النقاط ما لم يتم استخدام عامل التصفية \"(أي)\"."
+    high_trust_flaggers_auto_hide_posts: "إخفاء منشورات المستخدم الجديدة تلقائيًا بعد الإبلاغ المستخدمين من مستوى الثقة 3 عنها كغير مرغوب فيها"
+    cooldown_hours_until_reflag: "الوقت الذي يجب على المستخدمين انتظاره قبل أن يتمكنوا من إعادة الإبلاغ عن منشور"
+    slow_mode_prevents_editing: "هل يمنع \"الوضع البطيء\" التعديل بعد edit_grace_period؟"
     reply_by_email_enabled: "تفعيل الرد على الموضوعات عبر البريد الإلكتروني"
     reply_by_email_address: "نموذج لعنوان البريد الإلكتروني الوارد عند الرد عبر البريد الإلكتروني، مثلًا: %%{reply_key}@reply.example.com أو replies+%%{reply_key}@example.com"
+    alternative_reply_by_email_addresses: "قائمة النماذج البديلة للرد عبر البريد الإلكتروني على عناوين البريد الإلكتروني الوارد. مثال: %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
+    incoming_email_prefer_html: "استخدام HTML بدلًا من النص للرسائل الإلكترونية الواردة"
+    strip_incoming_email_lines: "إزالة المسافات السابقة واللاحقة من كل سطر من الرسائل الإلكترونية الواردة"
+    disable_emails: "منع Discourse من إرسال أي نوع من الرسائل الإلكترونية. حدِّد \"نعم\" لإيقاف الرسائل الإلكترونية إلى جميع المستخدمين. حدِّد \"غير فريق العمل\" لإيقاف الرسائل الإلكترونية للمستخدمين من غير فريق العمل فقط."
     strip_images_from_short_emails: "إزالة الصور من الرسائل الإلكترونية التي يقل حجمها عن 2800 بايت"
     short_email_length: "طول البريد الإلكتروني القصير بالبايت"
     display_name_on_email_from: "عرض الأسماء الكاملة في حقول \"من:\" في الرسائل الإلكترونية"
     unsubscribe_via_email: "السماح للمستخدمين بإلغاء الاشتراك في الرسائل الإلكترونية عن طريق إرسال رسالة إلكترونية تحتوي على عبارة \"unsubscribe\" في الموضوع أو النص"
+    unsubscribe_via_email_footer: "إرفاق رابط mailto: لإلغاء الاشتراك عبر البريد الإلكتروني في تذييل الرسائل الإلكترونية المُرسَلة"
     delete_email_logs_after_days: "حذف سجلات البريد الإلكتروني بعد (N) يوم. 0 للاحتفاظ بها إلى أجلٍ غير مسمى"
+    disallow_reply_by_email_after_days: "عدم السماح بالرد عبر البريد الإلكتروني بعد (N) يوم. 0 للاحتفاظ به إلى أجلٍ غير مسمى"
     max_emails_per_day_per_user: "الحد الأقصى لعدد الرسائل الإلكترونية التي سيتم إرسالها إلى المستخدمين يوميًا. 0 لإيقاف الحد"
+    enable_staged_users: "إنشاء مستخدمين مؤقتين تلقائيًا عند معالجة الرسائل الإلكترونية الواردة"
+    maximum_staged_users_per_email: "الحد الأقصى لعدد المستخدمين المؤقتين الذين تم إنشاؤهم في أثناء معالجة رسالة إلكترونية واردة"
+    auto_generated_allowlist: "قائمة عناوين البريد الإلكتروني التي لن يتم التحقُّق منها للمحتوى الذي تم إنشاؤه تلقائيًا. مثال: foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "حظر الرسائل الإلكترونية الواردة التي تم تحديدها على أنها منشأة تلقائيًا."
     ignore_by_title: "تجاهل الرسائل الإلكترونية الواردة بناءً على عنوانها"
+    mailgun_api_key: "مفتاح API السري لمحرك Mailgun والمُستخدَم في التحقُّق من رسائل خطاف الويب"
+    soft_bounce_score: "نقاط الارتداد التي تتم إضافتها إلى المستخدم عند حدوث ارتداد مؤقت"
+    hard_bounce_score: "نقاط الارتداد التي تتم إضافتها إلى المستخدم عند حدوث ارتداد دائم"
+    bounce_score_threshold: "أقصى عدد من نقاط الارتداد قبل أن نتوقف عن مراسلة مستخدم عبر البريد الإلكتروني"
+    reset_bounce_score_after_days: "إعادة ضبط نقاط الارتداد تلقائيًا بعد X يوم"
+    blocked_attachment_content_types: "قائمة الكلمات الرئيسية المُستخدَمة في حظر المرفقات بناءً على نوع المحتوى"
+    blocked_attachment_filenames: "قائمة الكلمات الرئيسية المُستخدَمة في حظر المرفقات بناءً على اسم الملف"
+    forwarded_emails_behaviour: "كيفية التعامل مع البريد الإلكتروني المُعاد توجيهه إلى Discourse"
+    always_show_trimmed_content: "عرض جزء مقتطع من الرسائل الإلكترونية الواردة بشكلٍ دائم. تحذير: قد يكشف هذا الجزء عناوين البريد الإلكتروني."
+    trim_incoming_emails: "اقتطاع جزء من الرسائل الإلكترونية الواردة غير ذات الصلة"
+    private_email: "عدم تضمين محتوى من منشورات أو موضوعات في عنوان الرسالة الإلكترونية أو نص الرسالة الإلكترونية. ملاحظة: يؤدي أيضًا إلى إيقاف ملخصات البريد الإلكتروني."
+    email_total_attachment_size_limit_kb: "أقصى حجم إجمالي بالكيلوبايت للملفات المُرفَقة بالرسائل الإلكترونية الصادرة. اضبط القيمة على 0 لإيقاف إرسال المرفقات."
+    post_excerpts_in_emails: "إرسال المقتطفات بدلًا من المنشورات الكاملة بشكلٍ دائم في رسائل الإشعارات عبر البريد الإلكتروني"
+    raw_email_max_length: "عدد الأحرف التي يجب تخزينها للرسائل الإلكترونية الواردة"
+    raw_rejected_email_max_length: "عدد الأحرف التي يجب تخزينها للرسائل الإلكترونية الواردة التي تم رفضها"
+    delete_rejected_email_after_days: "حذف الرسائل الإلكترونية المرفوضة التي مضى عليها أكثر من (n) يوم"
     manual_polling_enabled: "إرسال رسائل إلكترونية فورية باستخدام API لردود البريد الإلكتروني"
     pop3_polling_enabled: "استقصاء تلقي ردود البريد الإلكتروني عبر POP3"
     pop3_polling_ssl: "استخدام SSL أثناء الاتصال بخادم POP3 (موصى به)"
+    pop3_polling_openssl_verify: "التحقُّق من شهادة خادم TLS (الإعداد الافتراضي: مفعَّل)"
     pop3_polling_period_mins: "المدة بالدقائق بين التحقُّق من حساب POP3 للبريد الإلكتروني. ملاحظة: يتطلب إعادة التشغيل."
     pop3_polling_port: "منفذ الاستقصاء لحساب POP3"
     pop3_polling_host: "مضيف استقصاء تلقي الرسائل الإلكترونية عبر POP3"
     pop3_polling_username: "اسم مستخدم حساب POP3 لاستقصاء تلقي الرسائل الإلكترونية"
     pop3_polling_password: "كلمة مرور حساب POP3 لاستقصاء تلقي الرسائل الإلكترونية"
+    pop3_polling_delete_from_server: "حذف الرسائل الإلكترونية من الخادم. ملاحظة: إذا أوقفت هذا الإعداد، فستحتاج إلى تنظيف صندوق البريد الوارد يدويًا"
+    log_mail_processing_failures: "تسجيل جميع حالات فشل معالجة البريد الإلكتروني في <a href='%{base_path}/logs' target='_blank'>/logs</a>"
     email_in: 'السماح للمستخدمين بنشر موضوعات جديدة عبر البريد الإلكتروني (يتطلب الاستقصاء يدويًا أو عبر POP3). يمكنك إعداد العناوين في علامة التبويب "الإعدادات" لكل فئة.'
     email_in_min_trust: "الحد الأدنى لمستوى الثقة الذي يحتاجه المستخدم ليتم السماح له بنشر موضوعات جديدة عبر البريد الإلكتروني"
+    email_in_authserv_id: "معرِّف الخدمة التي تفحص المصادقة على الرسائل الإلكترونية الواردة. راجع <a href='https://meta.discourse.org/t/134358'>https://meta.discourse.org/t/134358</a> للحصول على إرشادات بشأن كيفية إعداده."
+    email_in_spam_header: "رأس البريد الإلكتروني لاكتشاف الرسائل غير المرغوب فيها"
+    enable_imap: "IMAP لمزامنة رسائل المجموعات"
+    enable_imap_write: "تفعيل مزامنة IMAP ثنائية الاتجاه. في حال الإيقاف، يتم إيقاف جميع عمليات الكتابة على حسابات IMAP."
+    enable_imap_idle: "استخدم آلية IMAP IDLE لانتظار الرسائل الإلكترونية الجديدة"
+    enable_smtp: "تفعيل SMTP لإرسال الإشعارات بشأن رسائل المجموعات"
+    imap_polling_period_mins: "الفترة بالدقائق بين مرات التحقُّق من الرسائل الإلكترونية في حسابات IMAP"
+    imap_polling_old_emails: "الحد الأقصى لعدد الرسائل الإلكترونية القديمة (المُعالَجة) التي سيتم تحديثها في كل مرة يتم فيها الاستقصاء عن مربع IMAP (0 للجميع)"
+    imap_polling_new_emails: "الحد الأقصى لعدد الرسائل الإلكترونية الجديدة (غير المُعالَجة) المطلوب تحديثها في كل مرة يتم فيها الاستقصاء عن مربع IMAP"
+    imap_batch_import_email: "الحد الأدنى لعدد الرسائل الإلكترونية الجديدة التي تؤدي إلى تشغيل وضع الاستيراد (يوقف تنبيهات المنشور)"
     email_prefix: "[label] المُستخدَم في موضوع الرسائل الإلكترونية. سيتم استخدام \"العنوان\" افتراضيًا إذا لم يتم ضبطه."
     email_site_title: "عنوان الموقع المُستخدَم كمُرسِل للرسائل الإلكترونية من الموقع. سيتم استخدام \"العنوان\" افتراضيًا إذا لم يتم تحديده. إذا كان \"العنوان\" يحتوي على أحرف غير مسموح بها في سلاسل مُرسِل الرسالة الإلكترونية، فاستخدم هذا الإعداد."
+    find_related_post_with_key: "استخدام `reply key` فقط للعثور على المنشور الذي تم الرد عليه. تحذير: يسمح إيقاف هذا الإعداد بانتحال هوية المستخدم بناءً على عنوان البريد الإلكتروني."
     minimum_topics_similar: "عدد الموضوعات التي يجب أن تكون موجودة قبل تقديم موضوعات مشابهة عند كتابة موضوعات جديدة"
     relative_date_duration: "عدد الأيام بعد النشر التي سيتم بعدها عرض تواريخ النشر بشكلٍ نسبي (7 أيام) بدلًا من عرضها بشكلٍ مطلق (20 فبراير)"
     delete_user_max_post_age: "عدم السماح بحذف المستخدمين الذين مضى على منشورهم الأول أكثر من (x) يوم"
     delete_all_posts_max: "الحد الأقصى لعدد المنشورات التي يمكن حذفها دفعة واحدة باستخدام الزر \"حذف جميع المنشورات\". إذا كان لدى المستخدم أكثر من هذا العدد من المنشورات، فلا يمكن حذف جميع المنشورات دفعة واحدة ولا يمكن حذف المستخدم."
+    delete_user_self_max_post_count: "الحد الأقصى لعدد المنشورات التي يمكن للمستخدم إنشاؤها مع السماح بالحذف الذاتي للحساب. اضبطها على -1 لإيقاف الحذف الذاتي للحساب."
+    username_change_period: "الحد الأقصى لعدد الأيام بعد التسجيل التي يمكن للحسابات فيها تغيير اسم المستخدم (0 لعدم السماح بتغيير اسم المستخدم)"
     email_editable: "السماح للمستخدمين بتغيير عنوان بريدهم الإلكتروني بعد التسجيل"
+    logout_redirect: "الموقع الذي سيتم إعادة توجيه المتصفح إليه بعد تسجيل الخروج (على سبيل المثال: https://example.com/logout)"
     allow_uploaded_avatars: "السماح للمستخدمين بتحميل صور مخصَّصة لملفاتهم الشخصية"
     default_avatars: "عناوين URL للصور الرمزية التي سيتم استخدامها افتراضيًا للمستخدمين الجُدد حتى يغيروها"
     automatically_download_gravatars: "تنزيل Gravatars للمستخدمين عند إنشاء الحساب أو تغيير عنوان البريد الإلكتروني"
     digest_topics: "الحد الأقصى لعدد الموضوعات الشائعة لعرضها في ملخص البريد الإلكتروني"
+    digest_posts: "أقصى عدد من المنشورات الرائجة التي سيتم عرضها في ملخص البريد الإلكتروني"
     digest_other_topics: "الحد الأقصى لعدد الموضوعات التي سيتم إظهارها في قسم \"الجديد في الموضوعات والفئات التي تتابعها\" من ملخص البريد الإلكتروني"
+    digest_min_excerpt_length: "الحد الأدنى من مقتطفات المنشورات في ملخص البريد الإلكتروني بالأحرف"
+    suppress_digest_email_after_days: "إيقاف الرسائل الإلكترونية التلخيصية للمستخدمين الذين لم يظهروا على الموقع لأكثر من (n) يوم"
     digest_suppress_categories: "منع إدراج هذه الفئات في الرسائل الإلكترونية التلخيصية"
     disable_digest_emails: "إيقاف الرسائل الإلكترونية التلخيصية لجميع المستخدمين"
+    apply_custom_styles_to_digest: "يتم تطبيق نموذج البريد الإلكتروني المخصَّص وcss على الرسائل الإلكترونية التلخيصية."
+    email_accent_bg_color: "لون التمييز الذي سيتم استخدامه كخلفية لبعض العناصر في الرسائل الإلكترونية بتنسيق HTML. أدخل اسم لون (\"أحمر\") أو قيمة سداسية عشرية (\"# FF0000\")."
+    email_accent_fg_color: "لون النص المعروض على لون خلفية البريد الإلكتروني في الرسائل الإلكترونية بتنسيق HTML. أدخل اسم لون (\"أبيض\") أو قيمة سداسية عشرية (\"#FFFFFF\")."
+    email_link_color: "لون الروابط في الرسائل الإلكترونية بتنسيق HTML. أدخل اسم لون (\"أزرق\") أو قيمة سداسية عشرية (\"# 0000FF\")."
     detect_custom_avatars: "التحقُّق من تحميل المستخدمين صورًا مخصَّصة لملفاتهم الشخصية من عدمه"
     max_daily_gravatar_crawls: "الحد الأقصى لعدد المرات التي سيتحقَّق فيها Discourse من Gravatar بحثًا عن صور رمزية مخصَّصة في اليوم"
+    public_user_custom_fields: "قائمة بحقول المستخدمين المخصَّصة التي يمكن استردادها باستخدام API."
+    staff_user_custom_fields: "قائمة بحقول المستخدم المخصَّصة التي يمكن استردادها لفريق العمل باستخدام API."
     enable_user_directory: "توفير دليل للمستخدمين للتصفُّح"
+    enable_group_directory: "توفير دليل بالمجموعات للتصفُّح"
+    enable_category_group_moderation: "السماح للمجموعات بالإشراف على المحتوى في فئات معيَّنة"
+    group_in_subject: "ضبط %%{optional_pm} في موضوع الرسالة الإلكترونية على اسم المجموعة الأولى في رسالة خاصة، راجع: <a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>تخصيص تنسيق الموضوع للرسائل الإلكترونية القياسية</a>"
     allow_anonymous_posting: "السماح للمستخدمين بالتبديل إلى الوضع المجهول"
     anonymous_posting_min_trust_level: "الحد الأدنى لمستوى الثقة المطلوب لتفعيل النشر المجهول"
     anonymous_account_duration_minutes: "لحماية إخفاء الهوية، أنشئ حسابًا مجهولًا جديدًا كل N دقيقة لكل مستخدم. مثال: إذا تم الضبط على 600، سيتم إنشاء حساب مجهول جديد بمجرد مرور 600 دقيقة على آخر منشور وتحوُّل المستخدم إلى مجهول."
     hide_user_profiles_from_public: "إيقاف بطاقات المستخدمين والملفات الشخصية لهم ودليل المستخدم للمستخدمين المجهولين"
+    allow_users_to_hide_profile: "السماح للمستخدمين بإخفاء ملفاتهم الشخصية ووجودهم"
+    allow_featured_topic_on_user_profiles: "السماح للمستخدمين بعرض رابط لموضوع على بطاقة المستخدم والملف الشخصي"
+    show_inactive_accounts: "السماح للمستخدمين الذين سجَّلوا الدخول باستعراض الملفات الشخصية للحسابات غير النشطة"
+    hide_suspension_reasons: "عدم عرض أسباب التعليق بشكلٍ عام في الملفات الشخصية للمستخدمين"
+    log_personal_messages_views: "تسجيل مرات عرض الرسائل الشخصية بواسطة المسؤول للمستخدمين/المجموعات الأخرى"
+    ignored_users_count_message_threshold: "إرسال إشعار إلى المشرفين إذا تم تجاهل مستخدم معيَّن بواسطة هذا العدد من المستخدمين الآخرين"
+    ignored_users_message_gap_days: "وقت الانتظار قبل إرسال إشعار إلى المشرفين مرة أخرى بشأن مستخدم تم تجاهله بواسطة الكثيرين"
+    clean_up_inactive_users_after_days: "عدد الأيام قبل إزالة مستخدم غير نشط (مستوى الثقة 0 بلا أي منشورات). اضبط القيمة على 0 لإيقاف التنظيف."
+    clean_up_unused_staged_users_after_days: "عدد الأيام قبل إزالة مستخدم مؤقت غير مُستخدَم (مستوى الثقة 0 بلا أي منشورات). اضبط القيمة على 0 لإيقاف التنظيف."
+    user_selected_primary_groups: "السماح للمستخدمين بضبط مجموعتهم الأساسية"
+    max_notifications_per_user: "الحد الأقصى من الإشعارات لكل مستخدم، سيتم حذف الإشعارات القديمة إذا تم تجاوز هذا الرقم. يتم فرض هذا الإعداد أسبوعيًا. اضبط القيمة على 0 للإيقاف."
+    allowed_user_website_domains: "سيتم التحقُّق من الموقع الإلكتروني للمستخدم مقابل هذه النطاقات. قائمة مفصولة بشرائط عمودية."
     allow_profile_backgrounds: "السماح للمستخدمين بتحميل خلفيات للملفات الشخصية"
     sequential_replies_threshold: "عدد المنشورات التي يجب على المستخدم إنشاؤها في على التوالي في الموضوع قبل أن يتم تذكيره بوجود عدد كبير جدًا من الردود المتسلسلة"
+    get_a_room_threshold: "عدد المنشورات التي يجب على المستخدم إنشاؤها للشخص نفسه في الموضوع نفسه قبل أن يتم تحذيره"
     enable_mobile_theme: "تستخدم الأجهزة الجوَّالة سمة متوافقة مع الجوَّال، مع إمكانية التبديل إلى الموقع الكامل. يمكنك إيقاف هذا إذا كنت تريد استخدام ورقة أنماط مخصَّصة تستجيب بشكلٍ كامل."
     dominating_topic_minimum_percent: "ما النسبة المئوية للمنشورات التي يجب على المستخدم إنشاؤها في الموضوع قبل أن يتم تذكيره بالسيطرة الزائدة على الموضوع."
     disable_avatar_education_message: "إيقاف الرسالة التعليمية لتغيير الصورة الرمزية"
     suppress_uncategorized_badge: "عدم إظهار الشارة للموضوعات غير المصنَّفة في قوائم الموضوعات"
+    header_dropdown_category_count: "عدد الفئات التي يمكن عرضها في القائمة المنسدلة للرأس"
+    permalink_normalizations: "تطبيق التعبير العادي التالي قبل مطابقة الروابط الثابتة، على سبيل المثال: سيؤدي استخدام /(topic.*)\\?.*/\\1 إلى إزالة سلاسل الاستعلام من مسارات الموضوع. التنسيق هو regex+string. استخدم \\1 وما إلى ذلك للوصول إلى الالتقاطات."
+    global_notice: "عرض بانر عام عاجل وطارئ وغير قابل للتجاهل لجميع الزوار. قم بالتغيير إلى قيمة فارغة لإخفائه (مسموح باستخدام HTML)."
     disable_system_edit_notifications: "إيقاف إشعارات التعديل بواسطة مستخدم النظام عندما يكون \"download_remote_images_to_local\" نشطًا."
+    notification_consolidation_threshold: "عدد إشعارات الإعجاب أو طلبات العضوية المتلقاة قبل دمج الإشعارات في رسالة واحدة. اضبط القيمة على 0 للإيقاف."
+    likes_notification_consolidation_window_mins: "المدة بالدقائق التي يتم فيها دمج إشعارات الإعجاب في إشعار واحد بمجرد الوصول إلى الحد الأقصى. يمكن إعداد الحد الأقصى عبر `SiteSetting.notification_consolidation_threshold`."
     automatically_unpin_topics: "إلغاء تثبيت الموضوعات تلقائيًا عندما يصل المستخدم إلى النهاية"
     read_time_word_count: "عدد الكلمات في الدقيقة لحساب الوقت المقدَّر للقراءة"
+    topic_page_title_includes_category: "يتضمَّن <a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>وسم العنوان</a> لصفحة الموضوع اسم الفئة."
+    native_app_install_banner_ios: "يعرض بانر تطبيق DiscourseHub على أجهزة iOS للمستخدمين المنتظمين (مستوى الثقة 1 وأعلى)."
+    native_app_install_banner_android: "يعرض بانر تطبيق DiscourseHub على أجهزة Android للمستخدمين المنتظمين (مستوى الثقة 1 وأعلى)."
+    app_association_android: "محتويات نقطة نهاية <a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a> المُستخدَمة في API لروابط الأصول الرقمية من Google"
+    app_association_ios: "محتويات نقطة نهاية <a href='%{base_path}/apple-app-site-association'>apple-app-site-association</a> المُستخدَمة لإنشاء روابط عامة بين هذا الموقع وتطبيقات iOS"
+    share_anonymized_statistics: "مشاركة إحصاءات الاستخدام المجهولة"
+    auto_handle_queued_age: "التعامل تلقائيًا مع السجلات التي تنتظر المراجعة بعد هذا العدد من الأيام. سيتم تجاهل البلاغات. وسيتم رفض المنشورات والمستخدمين في قائمة الانتظار. اضبط القيمة على 0 لإيقاف هذه الميزة."
+    svg_icon_subset: "إضافة 5 أيقونات إضافية من FontAwesome ترغب في تضمينها في أصولك. استخدم البادئة \"-fa\" للرموز الثابتة، و\"-far\" للرموز العادية و\"-fab\" لرموز الوسوم التجارية."
+    max_prints_per_hour_per_user: "الحد الأقصى لعدد مرات ظهور الصفحة /print (اضبط القيمة على 0 للإيقاف)"
     full_name_required: "حقل الاسم الكامل مطلوب في الملف الشخصي للمستخدم"
     enable_names: "إظهار الاسم الكامل للمستخدم في ملفه الشخصي وبطاقة المستخدم والرسائل الإلكترونية. يمكنك إيقاف هذا الإعداد لإخفاء الاسم الكامل في كل مكان."
     display_name_on_posts: "إظهار الاسم الكامل للمستخدم في منشوراته بالإضافة إلى اسم المستخدم الخاص به @username"
     show_time_gap_days: "عرض الفجوة الزمنية في الموضوع إذا تم إنشاء منشورين بفارق هذا العدد من الأيام"
     short_progress_text_threshold: "بعد أن يتجاوز عدد المنشورات في الموضوع هذا الرقم، سيعرض شريط التقدُّم رقم المنشور الحالي فقط. إذا غيَّرت عرض شريط التقدُّم، فقد تحتاج إلى تغيير هذه القيمة."
+    default_code_lang: "تطبيق تمييز بنية لغة البرمجة الافتراضية على كتل رموز GitHub البرمجية (auto، nohighlight، ruby، python، إلى آخره.)"
     warn_reviving_old_topic_age: "سيتم عرض تحذير عندما يبدأ شخص ما في الرد على موضوع يكون فيه الرد الأخير أقدم من هذا العدد من الأيام. يمكنك إيقاف هذا الإعداد عن طريق الضبط على 0."
     autohighlight_all_code: "فرض تمييز التعليمات البرمجية على جميع كتل التعليمات البرمجية مسبقة التنسيق حتى في حال عدم تحديد اللغة بشكلٍ صريح."
+    highlighted_languages: "القواعد المضمَّنة لتمييز البنية. (تحذير: قد يؤثر تضمين عدد كبير جدًا من اللغات على الأداء) راجع: <a href='https://highlightjs.org/static/demo/' target='_blank'>https://highlightjs.org/static/demo</a> للحصول على عرض توضيحي"
+    show_copy_button_on_codeblocks: "أضف زرًا إلى قوالب الرمز البرمجي لنسخ محتويات الكتلة إلى حافظة المستخدم. هذه الميزة غير مدعومة في Internet Explorer."
+    embed_any_origin: "السماح بالمحتوى القابل للتضمين بغض النظر عن المصدر. هذا الإعداد مطلوب لتطبيقات الأجهزة الجوَّالة ذات نموذج HTML ثابت."
+    embed_topics_list: "دعم تضمين HTML لقوائم الموضوعات"
+    embed_set_canonical_url: "ضبط عنوان URL الأساسي للموضوعات المضمَّنة على عنوان URL للمحتوى المضمَّن"
     embed_truncate: "اقتطاع المنشورات المضمَّنة"
+    embed_unlisted: "سيتم إلغاء إدراج الموضوعات المستوردة حتى يرد المستخدم."
+    embed_support_markdown: "دعم تنسيق Markdown للمنشورات المضمَّنة"
+    allowed_embed_selectors: "قائمة مفصولة بفاصلات لعناصر CSS المسموح بها في التضمينات"
+    allowed_href_schemes: "الأنظمة المسموح بها في الروابط بالإضافة إلى http وhttps"
     embed_post_limit: "الحد الأقصى لعدد المنشورات التي سيتم تضمينها"
     embed_username_required: "اسم المستخدم مطلوب لإنشاء الموضوع"
+    notify_about_flags_after: "إرسال رسالة خاصة إلى المشرفين إذا كانت هناك بلاغات لم يتم التعامل معها بعد هذا العدد من الساعات. اضبط القيمة على 0 للإيقاف."
     show_create_topics_notice: "إظهار إشعار يطلب من المسؤولين إنشاء بعض الموضوعات إذا كان الموقع يحتوي على أقل من 5 موضوعات عامة"
     delete_drafts_older_than_n_days: "حذف المسودات الأقدم من (n) يوم"
+    delete_merged_stub_topics_after_days: "عدد الأيام التي يجب انتظارها قبل حذف الموضوعات البديلة المدمجة بالكامل تلقائيًا. اضبط القيمة على 0 لعدم حذف الموضوعات البديلة أبدًا."
+    bootstrap_mode_min_users: "الحد الأدنى لعدد المستخدمين المطلوب لإيقاف وضع التمهيد (اضبط القيمة على 0 للإيقاف)"
+    prevent_anons_from_downloading_files: "منع المستخدمين المجهولين من تنزيل المرفقات"
+    secure_media: 'يقيِّد من الوصول إلى جميع التحميلات (الصور والفيديوهات والملفات الصوتية والنصوص وملفات pdf وzip وغيرها). إذا تم تفعيل "تسجيل الدخول مطلوب"، سيتمكن المستخدمون الذين سجَّلوا الدخول فقط من الوصول إلى التحميلات. بخلاف ذلك، سيتم تقييد الوصول على تحميلات الوسائط في الرسائل الخاصة والفئات الخاصة. تحذير: هذا الإعداد معقَّد ويتطلب فهمًا إداريًا عميقًا. راجع <a target="_blank" href="https://meta.discourse.org/t/secure-media-uploads/140017">the موضوع الوسائط الآمنة على Meta</a> لمعرفة التفاصيل.'
+    secure_media_allow_embed_images_in_emails: "يسمح بتضمين الصور الآمنة التي عادةً ما يتم تنقيحها في الرسائل الإلكترونية، إذا كان حجمها أصغر من الإعداد `secure media max email embed image size kb`."
+    secure_media_max_email_embed_image_size_kb: "اقتطاع حجم الصور الآمنة التي سيتم تضمينها في الرسائل الإلكترونية إذا تم تفعيل الإعداد `secure media allow embed in emails`. سيكون هذا الإعداد بلا أي تأثير دون تفعيله."
     slug_generation_method: "اختيار طريقة إنشاء المسار. سيُنشئ الخيار \"ترميز\" سلسلة ترميز النسبة المئوية، بينما سيوقف الخيار \"لا يوجد\" المسار تمامًا."
     enable_emoji: "تفعيل الرموز التعبيرية"
+    enable_emoji_shortcuts: "سيتم تحويل نصوص الوجوه المبتسمة الشائعة مثل :) p: :( إلى رموز تعبيرية"
     emoji_set: "كيف تفضِّل الرموز التعبيرية الخاصة بك؟"
+    emoji_autocomplete_min_chars: "الحد الأدنى لعدد الأحرف المطلوب لتشغيل النافذة المنبثقة الخاصة بالإكمال التلقائي للرموز التعبيرية"
+    enable_inline_emoji_translation: "يسمح بتفعيل ترجمة الرموز التعبيرية المضمَّنة (بلا أي مسافات أو علامات ترقيم قبلها)"
     approve_post_count: "عدد المنشورات التي يجب الموافقة عليها من مستخدم جديد أو أساسي"
     approve_unless_trust_level: "ضرورة الموافقة على المنشورات للمستخدمين دون مستوى الثقة هذا"
+    approve_new_topics_unless_trust_level: "ضرورة الموافقة على المنشورات للمستخدمين دون مستوى الثقة هذا"
+    approve_unless_staged: "ضرورة الموافقة على الموضوعات والمنشورات الجديدة للمستخدمين المؤقتين"
+    notify_about_queued_posts_after: "إرسال إشعار إلى جميع المشرفين إذا كانت هناك منشورات تنتظر المراجعة لأكثر من هذا العدد من الساعات. اضبط القيمة على 0 لإيقاف هذه الإشعارات."
+    auto_close_messages_post_count: "الحد الأقصى لعدد المنشورات المسموح بها في رسالة قبل إغلاقها تلقائيًا (0 للإيقاف)"
+    auto_close_topics_post_count: "الحد الأقصى لعدد المنشورات المسموح بها في موضوع قبل إغلاقه تلقائيًا (0 للإيقاف)"
+    auto_close_topics_create_linked_topic: "إنشاء موضوع مرتبط جديد عندما يكون الموضوع مغلقًا تلقائيًا بناءً على الإعداد `auto close topics post count`"
+    code_formatting_style: "ضبط زر الرموز البرمجية في أداة الإنشاء بشكلٍ افتراضي على نمط تنسيق الرموز البرمجية هذا"
+    max_allowed_message_recipients: "الحد الأقصى المسموح به من المستلمين في الرسالة"
+    watched_words_regular_expressions: "الكلمات المُراقَبة هي تعبيرات عادية"
+    enable_diffhtml_preview: "الميزة التجريبية التي تستخدم diffHTML لمزامنة المعاينة بدلًا من إعادة العرض بالكامل"
+    old_post_notice_days: "عدد الأيام قبل أن يصبح الإشعار بشأن المنشور قديمًا"
+    new_user_notice_tl: "الحد الأدنى لمستوى الثقة المطلوب لرؤية الإشعارات بشأن منشور مستخدم جديد"
+    returning_user_notice_tl: "الحد الأدنى من مستوى الثقة المطلوب لرؤية الإشعارات بشأن منشور مستخدم عائد"
+    returning_users_days: "عدد الأيام التي يجب أن تمر قبل اعتبار المستخدم عائدًا"
+    review_media_unless_trust_level: "سيراجع فريق العمل منشورات المستخدمين من مستويات الثقة الأقل إذا كانت تحتوي على وسائط مضمَّنة."
+    blur_tl0_flagged_posts_media: "تمويه صور المنشورات التي تم الإبلاغ عنها لإخفاء المحتوى المحتمل أن يكون غير آمن للعمل"
+    enable_page_publishing: "السماح لفريق العمل بنشر الموضوعات إلى عناوين URL الجديدة بنمطهم الخاص"
+    show_published_pages_login_required: "يمكن للمستخدمين المجهولين رؤية الصفحات المنشورة، حتى عندما يكون تسجيل الدخول مطلوبًا."
+    skip_auto_delete_reply_likes: "تخطي حذف المنشورات التي تحتوي على هذا العدد من الإعجابات أو أكثر عند حذف الردود القديمة تلقائيًا"
+    default_email_digest_frequency: "عدد المرات التي يتلقى فيها المستخدمون رسائل إلكترونية تلخيصية بشكلٍ افتراضي"
+    default_include_tl0_in_digests: "تضمين المنشورات من المستخدمين الجُدد في الرسائل الإلكترونية التلخيصية بشكلٍ افتراضي. يمكن للمستخدمين تغيير ذلك في تفضيلاتهم."
+    default_email_level: "ضبط المستوى الافتراضي لإرسال الإشعارات عبر البريد الإلكتروني للموضوعات العادية"
+    default_email_messages_level: "ضبط المستوى الافتراضي لإرسال الإشعارات عبر البريد الإلكتروني عندما يراسل شخص ما المستخدم"
     default_email_mailing_list_mode: "إرسال رسالة إلكترونية لكل منشور جديد بشكلٍ افتراضي"
+    default_email_mailing_list_mode_frequency: "سيتلقى المستخدمون الذين فعَّلوا وضع القائمة البريدية الرسائل الإلكترونية لهذا العدد من المرات بشكلٍ افتراضي"
+    disable_mailing_list_mode: "عدم السماح للمستخدمين بتفعيل وضع القائمة البريدية (يمنع إرسال أي رسائل إلكترونية من القائمة البريدية.)"
     default_email_previous_replies: "تضمين الردود السابقة في الرسائل الإلكترونية بشكلٍ افتراضي"
     default_email_in_reply_to: "تضمين مقتطفات من الرد للنشر في الرسائل الإلكترونية بشكلٍ افتراضي"
     default_other_new_topic_duration_minutes: "الشرط الافتراضي العام الذي يُعتبَر فيه الموضوع جديدًا"
     default_other_auto_track_topics_after_msecs: "الوقت الافتراضي العام قبل أن يتم تتبُّع الموضوع تلقائيًا"
+    default_other_notification_level_when_replying: "مستوى إرسال الإشعارات الافتراضي العام عندما يرد المستخدم موضوع"
     default_other_external_links_in_new_tab: "فتح الروابط الخارجية في علامة تبويب جديدة بشكلٍ افتراضي"
     default_other_enable_quoting: "تفعيل الرد باقتباس للنص المميز بشكلٍ افتراضي"
+    default_other_enable_defer: "تفعيل وظيفة تأجيل الموضوع بشكلٍ افتراضي"
     default_other_dynamic_favicon: "إظهار عدد الموضوعات الجديدة/المحدَّثة على أيقونة المتصفح بشكلٍ افتراضي"
     default_other_skip_new_user_tips: "تخطي نصائح وشارات إعداد المستخدم الجديد"
     default_other_like_notification_frequency: "إرسال إشعار إلى المستخدمين بالإعجابات بشكلٍ افتراضي"
@@ -1261,10 +2230,60 @@ ar:
     default_categories_tracking: "قائمة الفئات التي يتم تتبُّعها بشكلٍ افتراضي"
     default_categories_muted: "قائمة الفئات التي يتم كتم صوتها بشكلٍ افتراضي"
     default_categories_watching_first_post: "قائمة الفئات التي سيتم فيها مراقبة أول منشور في كل موضوع جديد بشكلٍ افتراضي."
+    default_categories_regular: "قائمة الفئات التي لا يتم كتمها بشكلٍ افتراضي. يكون هذا الإعداد مفيدًا عند تفعيل إعداد الموقع `mute_all_categories_by_default`."
+    mute_all_categories_by_default: "ضبط مستوى الإشعارات الافتراضي لجميع الفئات على الكتم. يتطلب من المستخدمين الاشتراك في الفئات لتظهر في صفحات \"الأحدث\" و\"الفئات\". إذا كنت ترغب في تعديل الإعدادات الافتراضية للمستخدمين المجهولين، فاضبط إعدادات `default_categories_`."
+    default_tags_watching: "قائمة الوسوم التي تتم مراقبتها بشكلٍ افتراضي"
+    default_tags_tracking: "قائمة الوسوم التي يتم تتبُّعها بشكلٍ افتراضي"
+    default_tags_muted: "قائمة الوسوم التي يتم كتمها بشكلٍ افتراضي"
+    default_tags_watching_first_post: "قائمة الوسوم التي سيتم مراقبة أول منشور في كل موضوع جديد فيها بشكلِ افتراضي"
+    default_text_size: "حجم النص المحدَّد بشكلٍ افتراضي"
+    default_title_count_mode: "الوضع الافتراضي لعداد عنوان الصفحة"
+    retain_web_hook_events_period_days: "عدد أيام الاحتفاظ بسجلات أحداث خطافات الويب"
+    retry_web_hook_events: "إعادة المحاولة تلقائيًا 4 مرات لأحداث خطافات الويب التي فشلت. الفجوات الزمنية بين مرات إعادة المحاولة هي 1 و5 و25 و125 دقيقة."
+    revoke_api_keys_days: "عدد الأيام قبل إلغاء مفتاح API غير المُستخدَم تلقائيًا (0 للضبط على \"أبدًا\")"
+    allow_user_api_keys: "السماح بإنشاء مفاتيح API للمستخدم"
+    allow_user_api_key_scopes: "قائمة النطاقات المسموح بها لمفاتيح API للمستخدم"
+    min_trust_level_for_user_api_key: "مستوى الثقة المطلوب لإنشاء مفاتيح API للمستخدم"
+    allowed_user_api_auth_redirects: "عنوان URL المسموح به لإعادة توجيه المصادقة لمفاتيح API للمستخدم. يمكن استخدام رمز البدل * لمطابقة أي جزء منه (على سبيل المثال،www.example.com/*)."
+    allowed_user_api_push_urls: "عناوين URL المسموح لها بإرسال المعلومات إلى API للمستخدم قبل طلبها من الخادم"
+    expire_user_api_keys_days: "عدد الأيام قبل انتهاء صلاحية مفتاح API للمستخدم تلقائيًا (0 للضبط على \"أبدًا\")"
     tagging_enabled: "السماح بالوسوم في الموضوعات؟"
+    min_trust_to_create_tag: "الحد الأدنى لمستوى الثقة المطلوب لإنشاء وسم"
+    max_tags_per_topic: "الحد الأقصى لعدد الوسوم التي يمكن تطبيقها على موضوع"
+    max_tag_length: "الحد الأقصى لعدد الأحرف التي يمكن استخدامها في وسم"
+    max_tag_search_results: "الحد الأقصى لعدد النتائج التي يتم عرضها عند البحث عن الوسوم"
+    max_tags_in_filter_list: "الحد الأقصى لعدد الوسوم التي يتم عرضها في القائمة المنسدلة للتصفية. سيتم عرض الوسوم الأكثر استخدامًا."
+    tags_sort_alphabetically: "عرض الوسوم بترتيب أبجدي. الإعداد الافتراضي هو العرض بترتيب الأكثر رواجًا."
+    tags_listed_by_group: "إدراج الوسوم حسب مجموعة الوسوم الموجودة في <a href='%{base_path}/tags' target='_blank'>صفحة الوسوم</a>"
+    tag_style: "النمط المرئي لشارات الوسوم"
+    allow_staff_to_tag_pms: "السماح للموظفين بوضع وسم على أي رسالة خاصة"
+    min_trust_level_to_tag_topics: "الحد الأدنى لمستوى الثقة المطلوب لوضع وسوم على الموضوعات"
+    suppress_overlapping_tags_in_list: "عدم عرض الوسم إذا كانت الوسوم تتطابق تمامًا مع الكلمات الموجودة في عناوين الموضوعات"
+    remove_muted_tags_from_latest: "عدم عرض الموضوعات التي تم وضع وسم الكتم فقط عليها في قائمة الموضوعات الحديثة"
+    force_lowercase_tags: "فرض استخدام الحروف الصغيرة فقط في جميع الوسوم الجديدة"
+    company_name: "اسم الشركة"
+    governing_law: "القانون المعمول به"
+    city_for_disputes: "مدينة النزاعات"
+    shared_drafts_category: "تفعيل ميزة المسودات المشتركة من خلال تخصيص فئة لمسودات الموضوعات. سيتم حذف الموضوعات في هذه الفئة من قوائم الموضوعات للمستخدمين من فريق العمل."
+    shared_drafts_min_trust_level: "السماح للمستخدمين برؤية المسودات المشتركة وتعديلها"
+    push_notifications_prompt: "عرض رسالة المطالبة بموافقة المستخدم"
+    push_notifications_icon: "رمز الشارة الذي يظهر في ركن الإشعارات. يوصى باستخدام صورة PNG أحادية اللون بمقاس 96 × 96 وخلفية شفافة."
+    base_font: "الخط الأساسي الذي سيتم استخدامه لمعظم النصوص على الموقع. يمكن تجاوز السمات عبر خاصية CSS المخصَّصة `--font-family`."
+    heading_font: "الخط الذي سيتم استخدامه للعناوين على الموقع. يمكن تجاوز السمات عبر خاصية CSS المخصَّصة `--heading-font-family`."
+    short_title: "سيتم استخدام العنوان القصير على الشاشة الرئيسية للمستخدم، أو المشغِّل، أو الأماكن الأخرى التي قد تكون المساحة فيها محدودة. يجب أن يقتصر على 12 حرفًا."
+    dashboard_hidden_reports: "السماح بإخفاء التقارير المحدَّدة من لوحة المعلومات"
+    dashboard_visible_tabs: "اختيار علامات التبويب المرئية في لوحة المعلومات"
+    dashboard_general_tab_activity_metrics: "اختيار التقارير التي سيتم عرضها كمقاييس للنشاط في علامة التبويب \"عام\""
+    gravatar_name: "اسم موفِّر خدمة Gravatar"
+    gravatar_base_url: "عنوان URL لقاعدة API الخاصة بموفِّر خدمة Gravatar"
+    gravatar_login_url: "عنوان URL المرتبط بالإعداد gravatar_base_url، والذي يوفِّر للمستخدم معلومات تسجيل الدخول إلى خدمة Gravatar"
+    share_quote_buttons: "تحديد العناصر التي تظهر في أداة مشاركة الاقتباسات وترتيبها"
+    share_quote_visibility: "تحديد وقت إظهار أزرار مشاركة الاقتباسات: \"أبدًا\" للمستخدمين المجهولين فقط أو لجميع المستخدمين "
+    create_revision_on_bulk_topic_moves: "إنشاء مراجعة للمنشورات الأولى عند نقل الموضوعات إلى فئة جديدة بشكلٍ مجمَّع"
     errors:
       invalid_email: "عنوان البريد الإلكتروني غير صالح."
       invalid_username: "لا يوجد مستخدم باسم المستخدم هذا."
+      invalid_group: "لا توجد مجموعة بهذا الاسم."
       invalid_integer_min_max: "يجب أن تكون القيمة بين %{min} و%{max}."
       invalid_integer_min: "يجب أن تكون القيمة %{min} أو أكبر."
       invalid_integer_max: "لا يمكن أن تكون القيمة أكبر من %{max}."
@@ -1275,34 +2294,131 @@ ar:
       invalid_string_min_max: "يجب أن يكون عدد الأحرف بين {min} و{max}."
       invalid_string_min: "يجب ألا يقل عدد الأحرف عن {min}."
       invalid_string_max: "يجب ألا يزيد عدد الأحرف عن {max}."
+      invalid_json: "ملف JSON غير صالح."
       invalid_reply_by_email_address: "يجب أن تحتوي القيمة على \"%{reply_key}\" وأن تكون مختلفة عن الرسالة الإلكترونية للإشعار."
+      invalid_alternative_reply_by_email_addresses: "يجب أن تحتوي جميع القيم على \"%{reply_key}\" وأن تكون مختلفة عن الرسالة الإلكترونية للإشعار."
+      pop3_polling_host_is_empty: "يجب عليك ضبط `pop3 polling host` قبل تفعيل استقصاء POP3."
+      pop3_polling_username_is_empty: "يجب عليك ضبط `pop3 polling username` قبل تفعيل استقصاء POP3."
+      pop3_polling_password_is_empty: "يجب عليك ضبط `pop3 polling password` قبل تفعيل استقصاء POP3."
+      pop3_polling_authentication_failed: "فشلت مصادقة POP3. يُرجى التحقُّق من بيانات اعتماد pop3 لديك."
+      reply_by_email_address_is_empty: "يجب عليك ضبط `reply by email address` قبل تفعيل الرد عن طريق البريد الإلكتروني."
+      email_polling_disabled: "يجب عليك ضبط الاستقصاء اليدوي أو من خلال POP3 قبل تفعيل الرد عن طريق البريد الإلكتروني."
+      user_locale_not_enabled: "يجب عليك تفعيل `allow user locale` أولًا قبل تفعيل هذا الإعداد."
+      invalid_regex: "التعبير العادي غير صالح أو غير مسموح به."
+      email_editable_enabled: "يجب إيقاف `email editable` قبل تفعيل هذا الإعداد."
+      staged_users_disabled: "يجب عليك تفعيل `staged users` أولًا قبل تفعيل هذا الإعداد."
+      reply_by_email_disabled: "يجب عليك تفعيل `reply by email` أولًا قبل تفعيل هذا الإعداد."
+      discourse_connect_url_is_empty: "يجب عليك ضبط `discourse connect url` قبل تفعيل هذا الإعداد."
+      discourse_connect_invite_only: "لا يمكنك تفعيل DiscourseConnect والدعوة فقط في الوقت نفسه."
+      enable_local_logins_disabled: "يجب عليك تفعيل `enable local logins` أولًا قبل تفعيل هذا الإعداد."
+      min_username_length_exists: "لا يمكنك ضبط الحد الأدنى لطول اسم المستخدم على قيمة أطول من أقصر اسم مستخدم (%{username})."
       min_username_length_range: "لا يمكنك ضبط الحد الأدنى ليكون أكبر من الحد الأقصى."
+      max_username_length_exists: "لا يمكنك ضبط الحد الأقصى لطول اسم المستخدم على قيمة أقصر من أطول اسم مستخدم (%{username})."
       max_username_length_range: "لا يمكنك ضبط الحد الأدنى ليكون أقل من الحد الأقصى."
+      invalid_hex_value: "يجب أن تكون قيم اللون عبارة عن رموز سداسية عشرية مكوَّنة من 6 أرقام."
+      empty_selectable_avatars: "يجب عليك تحميل صورتَين رمزيَّتَين قابلتَين للتحديد على الأقل قبل تفعيل هذا الإعداد."
+      category_search_priority:
+        low_weight_invalid: "لا يمكنك ضبط الأهمية على قيمة أكبر من أو تساوي 1."
+        high_weight_invalid: "لا يمكنك ضبط الأهمية على قيمة أقل من أو تساوي 1."
+      allowed_unicode_usernames:
+        regex_invalid: "التعبير العادي غير صالح: %{error}"
+        leading_trailing_slash: "يجب ألا يبدأ التعبير العادي بشرطة مائلة وينتهي بها."
+      unicode_usernames_avatars: "لا تدعم الصور الرمزية الداخلية للنظام أسماء المستخدمين بترميز Unicode."
+      list_value_count: "يجب أن تحتوي القائمة على قيم %{count} بالضبط."
+    placeholder:
+      discourse_connect_provider_secrets:
+        value: "الرمز السري لموفِّر خدمة DiscourseConnect"
   search:
+    extreme_load_error: "الموقع تحت ضغط شديد والبحث متوقف، حاول مرة أخرى لاحقًا"
     within_post: "#%{post_number} بواسطة %{username}"
     types:
       category: "الفئات"
       topic: "النتائج"
       user: "المستخدمون"
     results_page: "نتائج البحث عن \"%{term}\""
+    audio: "[صوت]"
+    video: "[فيديو]"
   discourse_connect:
+    login_error: "خطأ في تسجيل الدخول"
     not_found: "تعذَّر العثور على حسابك. يُرجى التواصل مع مسؤول الموقع."
+    account_not_approved: "حسابك بانتظار الموافقة. ستتلقى إشعارًا عبر البريد الإلكتروني عند الموافقة عليك."
     unknown_error: "حدثت مشكلة في حسابك. يُرجى التواصل مع مسؤول الموقع."
     timeout_expired: "انتهت مهلة تسجيل الدخول إلى الحساب، يُرجى محاولة تسجيل الدخول مرة أخرى."
+    no_email: "لم يتم تقديم عنوان بريد إلكتروني. يُرجى التواصل مع مسؤول الموقع."
+    blank_id_error: "`external_id` مطلوب، لكنه كان فارغًا"
+    email_error: "تعذَّر تسجيل حساب بعنوان البريد الإلكتروني <b>%{email} </b>. يُرجى التواصل مع مسؤول الموقع."
+    missing_secret: "فشلت المصادقة بسبب عدم توفُّر الرمز السري. تواصل مع مسؤولي الموقع لإصلاح هذه المشكلة."
+    invite_redeem_failed: "فشل استرداد الدعوة. يُرجى التواصل مع مسؤول الموقع."
   original_poster: "كاتب المنشور الأصلي"
   most_recent_poster: "أحدث ناشر"
+  frequent_poster: "ناشر متكرر"
+  poster_description_joiner: "، "
   redirected_to_top_reasons:
     new_user: "مرحبًا بك في مجتمعنا! هذه هي الموضوعات الحديثة الأكثر رواجًا."
     not_seen_in_a_month: "مرحبًا بعودتك! لم نرك منذ فترة. هذه هي الموضوعات الأكثر رواجًا في فترة غيابك."
   merge_posts:
+    edit_reason:
+      zero: "تم دمج %{count} منشور بواسطة %{username}"
+      one: "تم دمج منشور واحد (%{count}) بواسطة %{username}"
+      two: "تم دمج منشورَين (%{count}) بواسطة %{username}"
+      few: "تم دمج %{count} منشورات بواسطة %{username}"
+      many: "تم دمج %{count} منشورًا بواسطة %{username}"
+      other: "تم دمج %{count} منشور بواسطة %{username}"
     errors:
       different_topics: "لا يمكن دمج المنشورات التي تنتمي إلى موضوعات مختلفة."
       different_users: "لا يمكن دمج المنشورات التي تنتمي إلى مستخدمين مختلفين."
+      max_post_length: "لا يمكن دمج المنشورات لأن طول المنشور المجمَّع أكبر من الطول المسموح به."
+  move_posts:
+    new_topic_moderator_post:
+      zero: "تم تقسيم %{count} منشور إلى موضوع جديد: %{topic_link}"
+      one: "تم تقسيم منشور واحد إلى موضوع جديد: %{topic_link}"
+      two: "تم تقسيم منشورَين (%{count}) إلى موضوع جديد: %{topic_link}"
+      few: "تم تقسيم %{count} منشورات إلى موضوع جديد: %{topic_link}"
+      many: "تم تقسيم %{count} منشورًا إلى موضوع جديد: %{topic_link}"
+      other: "تم تقسيم %{count} منشور إلى موضوع جديد: %{topic_link}"
+    new_message_moderator_post:
+      zero: "تم تقسيم %{count} منشور إلى رسالة جديدة: %{topic_link}"
+      one: "تم تقسيم منشور واحد (%{count}) إلى رسالة جديدة: %{topic_link}"
+      two: "تم تقسيم منشورَين (%{count}) إلى رسالة جديدة: %{topic_link}"
+      few: "تم تقسيم %{count} منشورات إلى رسالة جديدة: %{topic_link}"
+      many: "تم تقسيم %{count} منشورًا إلى رسالة جديدة: %{topic_link}"
+      other: "تم تقسيم %{count} منشور إلى رسالة جديدة: %{topic_link}"
+    existing_topic_moderator_post:
+      zero: "تم دمج %{count} منشور في موضوع موجود: %{topic_link}"
+      one: "تم دمج منشور واحد في موضوع موجود: %{topic_link}"
+      two: "تم دمج منشورَين (%{count}) في موضوع موجود: %{topic_link}"
+      few: "تم دمج %{count} منشورات في موضوع موجود: %{topic_link}"
+      many: "تم دمج %{count} منشورًا في موضوع موجود: %{topic_link}"
+      other: "تم دمج %{count} منشور في موضوع موجود: %{topic_link}"
+    existing_message_moderator_post:
+      zero: "تم دمج %{count} منشور في رسالة موجودة: %{topic_link}"
+      one: "تم دمج منشور واحد (%{count}) في رسالة موجودة: %{topic_link}"
+      two: "تم دمج منشورَين (%{count}) في رسالة موجودة: %{topic_link}"
+      few: "تم دمج %{count} منشورات في رسالة موجودة: %{topic_link}"
+      many: "تم دمج %{count} منشورًا في رسالة موجودة: %{topic_link}"
+      other: "تم دمج %{count} منشور في رسالة موجودة: %{topic_link}"
+  change_owner:
+    post_revision_text: "تم نقل الملكية"
   publish_page:
     slug_errors:
       blank: "لا يمكن تركه خاليًا"
+      unavailable: "غير متوفرة"
       invalid: "يحتوي على أحرف غير صالحة"
   topic_statuses:
+    autoclosed_message_max_posts:
+      zero: "تم إغلاق هذه الرسالة تلقائيًا بعد الوصول إلى الحد الأقصى للردود (%{count})."
+      one: "تم إغلاق هذه الرسالة تلقائيًا بعد الوصول إلى الحد الأقصى للردود (%{count})."
+      two: "تم إغلاق هذه الرسالة تلقائيًا بعد الوصول إلى الحد الأقصى للردود (%{count})."
+      few: "تم إغلاق هذه الرسالة تلقائيًا بعد الوصول إلى الحد الأقصى للردود (%{count})."
+      many: "تم إغلاق هذه الرسالة تلقائيًا بعد الوصول إلى الحد الأقصى للردود (%{count})."
+      other: "تم إغلاق هذه الرسالة تلقائيًا بعد الوصول إلى الحد الأقصى للردود (%{count})."
+    autoclosed_topic_max_posts:
+      zero: "تم إغلاق هذا الموضوع تلقائيًا بعد بلوغ الحد الأقصى للردود (%{count})."
+      one: "تم إغلاق هذا الموضوع تلقائيًا بعد بلوغ الحد الأقصى للردود (%{count})."
+      two: "تم إغلاق هذا الموضوع تلقائيًا بعد بلوغ الحد الأقصى للردود (%{count})."
+      few: "تم إغلاق هذا الموضوع تلقائيًا بعد بلوغ الحد الأقصى للردود (%{count})."
+      many: "تم إغلاق هذا الموضوع تلقائيًا بعد بلوغ الحد الأقصى للردود (%{count})."
+      other: "تم إغلاق هذا الموضوع تلقائيًا بعد بلوغ الحد الأقصى للردود (%{count})."
     autoclosed_enabled_days:
       zero: "تم إغلاق هذا الموضوع تلقائيًا بعد %{count} يوم. لم يعُد مسموحًا بالردود الجديدة بعد الآن."
       one: "تم إغلاق هذا الموضوع تلقائيًا بعد يوم واحد (%{count}). لم يعُد مسموحًا بالردود الجديدة بعد الآن."
@@ -1345,62 +2461,294 @@ ar:
       few: "تم إغلاق هذا الموضوع تلقائيًا بعد %{count} دقائق من الرد الأخير. لم يعُد مسموحًا بالردود الجديدة."
       many: "تم إغلاق هذا الموضوع تلقائيًا بعد %{count} دقيقة من الرد الأخير. لم يعُد مسموحًا بالردود الجديدة."
       other: "تم إغلاق هذا الموضوع تلقائيًا بعد %{count} دقيقة من الرد الأخير. لم يعُد مسموحًا بالردود الجديدة."
+    autoclosed_disabled_days:
+      zero: "تم فتح هذا الموضوع تلقائيًا بعد %{count} يوم."
+      one: "تم فتح هذا الموضوع تلقائيًا بعد يوم واحد (%{count})."
+      two: "تم فتح هذا الموضوع تلقائيًا بعد يومَين (%{count})."
+      few: "تم فتح هذا الموضوع تلقائيًا بعد %{count} أيام."
+      many: "تم فتح هذا الموضوع تلقائيًا بعد %{count} يومًا."
+      other: "تم فتح هذا الموضوع تلقائيًا بعد %{count} يوم."
+    autoclosed_disabled_hours:
+      zero: "تم فتح هذا الموضوع تلقائيًا بعد %{count} ساعة."
+      one: "تم فتح هذا الموضوع تلقائيًا بعد ساعة واحدة (%{count})."
+      two: "تم فتح هذا الموضوع تلقائيًا بعد ساعتَين (%{count})."
+      few: "تم فتح هذا الموضوع تلقائيًا بعد %{count} ساعات."
+      many: "تم فتح هذا الموضوع تلقائيًا بعد %{count} ساعة."
+      other: "تم فتح هذا الموضوع تلقائيًا بعد %{count} ساعة."
+    autoclosed_disabled_minutes:
+      zero: "تم فتح هذا الموضوع تلقائيًا بعد %{count} دقيقة."
+      one: "تم فتح هذا الموضوع تلقائيًا بعد دقيقة واحدة (%{count})."
+      two: "تم فتح هذا الموضوع تلقائيًا بعد دقيقتَين (%{count})."
+      few: "تم فتح هذا الموضوع تلقائيًا بعد %{count} دقائق."
+      many: "تم فتح هذا الموضوع تلقائيًا بعد %{count} دقيقة."
+      other: "تم فتح هذا الموضوع تلقائيًا بعد %{count} دقيقة."
+    autoclosed_disabled_lastpost_days:
+      zero: "تم فتح هذا الموضوع تلقائيًا بعد %{count} يوم من الرد الأخير."
+      one: "تم فتح هذا الموضوع تلقائيًا بعد يوم واحد (%{count}) من الرد الأخير."
+      two: "تم فتح هذا الموضوع تلقائيًا بعد يومَين (%{count}) من الرد الأخير."
+      few: "تم فتح هذا الموضوع تلقائيًا بعد %{count} أيام من الرد الأخير."
+      many: "تم فتح هذا الموضوع تلقائيًا بعد %{count} يومًا من الرد الأخير."
+      other: "تم فتح هذا الموضوع تلقائيًا بعد %{count} يوم من الرد الأخير."
+    autoclosed_disabled_lastpost_hours:
+      zero: "تم فتح هذا الموضوع تلقائيًا بعد %{count} ساعة من الرد الأخير."
+      one: "تم فتح هذا الموضوع تلقائيًا بعد ساعة واحدة (%{count}) من الرد الأخير."
+      two: "تم فتح هذا الموضوع تلقائيًا بعد ساعتَين (%{count}) من الرد الأخير."
+      few: "تم فتح هذا الموضوع تلقائيًا بعد %{count} ساعات من الرد الأخير."
+      many: "تم فتح هذا الموضوع تلقائيًا بعد %{count} ساعة من الرد الأخير."
+      other: "تم فتح هذا الموضوع تلقائيًا بعد %{count} ساعة من الرد الأخير."
+    autoclosed_disabled_lastpost_minutes:
+      zero: "تم فتح هذا الموضوع تلقائيًا بعد %{count} دقيقة من الرد الأخير."
+      one: "تم فتح هذا الموضوع تلقائيًا بعد دقيقة واحدة (%{count}) من الرد الأخير."
+      two: "تم فتح هذا الموضوع تلقائيًا بعد دقيقتَين (%{count}) من الرد الأخير."
+      few: "تم فتح هذا الموضوع تلقائيًا بعد %{count} دقائق من الرد الأخير."
+      many: "تم فتح هذا الموضوع تلقائيًا بعد %{count} دقيقة من الرد الأخير."
+      other: "تم فتح هذا الموضوع تلقائيًا بعد %{count} دقيقة من الرد الأخير."
     autoclosed_disabled: "هذا الموضوع مفتوح الآن. مسموح بالردود الجديدة."
     autoclosed_disabled_lastpost: "هذا الموضوع مفتوح الآن. مسموح بالردود الجديدة."
+    auto_deleted_by_timer: "تم حذفه تلقائيًا بواسطة المؤقِّت."
   login:
+    invalid_second_factor_method: "طريقة المصادقة الثنائية المحدَّدة غير صالحة."
+    not_enabled_second_factor_method: "طريقة المصادقة الثنائية المحدَّدة غير مفعَّلة لحسابك."
     security_key_description: "عند تجهيز مفتاح الأمان المادي، اضغط على زر المصادقة باستخدام مفتاح الأمان أدناه."
     security_key_alternative: "جرِّب طريقة أخرى"
     security_key_authenticate: "المصادقة باستخدام مفتاح الأمان"
     security_key_not_allowed_error: "انتهت مهلة عملية مصادقة مفتاح الأمان أو تم إلغاؤها."
     security_key_no_matching_credential_error: "لم يتم العثور على بيانات اعتماد متطابقة في مفتاح الأمان المقدَّم."
     security_key_support_missing_error: "جهازك الحالي أو متصفحك لا يدعم استخدام مفاتيح الأمان. يُرجى استخدام طريقة مختلفة."
+    security_key_invalid: "حدث خطأ في أثناء التحقُّق من مفتاح الأمان."
     not_approved: "لم تتم الموافقة على حسابك حتى الآن. سيتم إعلامك عبر البريد الإلكتروني عندما تكون مستعدًا لتسجيل الدخول."
     incorrect_username_email_or_password: "اسم المستخدم أو البريد الإلكتروني أو كلمة المرور غير صحيحة"
+    incorrect_password: "كلمة المرور غير صحيحة"
     wait_approval: "نشكرك على الاشتراك. سنُرسل إليك إشعارًا عند الموافقة على حسابك."
     active: "تم تفعيل حسابك وأصبح جاهزًا للاستخدام."
+    activate_email: "<p>أنت على وشك الانتهاء! لقد أرسلنا رسالة إلكترونية للتفعيل إلى <b>%{email}</b>. يُرجى اتباع التعليمات الواردة في الرسالة الإلكترونية لتفعيل حسابك.</p><p>إذا لم يصل، فتحقَّق من مجلد الرسائل غير المرغوب فيها.</p>"
     not_activated: "لا يمكنك تسجيل الدخول بعد. لقد أرسلنا إليك رسالة إلكترونية للتفعيل. يُرجى اتباع التعليمات الواردة في الرسالة الإلكترونية لتفعيل حسابك."
     not_allowed_from_ip_address: "لا يمكنك تسجيل الدخول باسم %{username} من عنوان IP هذا."
     admin_not_allowed_from_ip_address: "لا يمكنك تسجيل الدخول كمسؤول من عنوان IP هذا."
+    reset_not_allowed_from_ip_address: "لا يمكنك طلب إعادة ضبط كلمة المرور من عنوان IP هذا."
     suspended: "لا يمكنك تسجيل الدخول حتى %{date}."
     suspended_with_reason: "تم تعليق الحساب حتى %{date}: %{reason}"
     errors: "%{errors}"
     not_available: "غير متاح. هل تريد تجربة %{suggestion}؟"
     something_already_taken: "حدث خطأ ما، قد يكون اسم المستخدم أو عنوان البريد الإلكتروني مسجَّلًا بالفعل. جرِّب رابط \"نسيت كلمة المرور\"."
+    omniauth_error:
+      generic: "عذرًا، حدث خطأ في أثناء تفويض حسابك. حاول مرة أخرى."
+      csrf_detected: "انتهت مهلة التفويض، أو بدَّلت المتصفح. حاول مرة أخرى."
+      request_error: "حدث خطأ عند بدء التفويض. حاول مرة أخرى."
+      invalid_iat: "تعذَّر التحقُّق من رمز التفويض بسبب اختلاف ساعة الخادم. حاول مرة أخرى."
+    omniauth_error_unknown: "حدث خطأ ما في أثناء عملية تسجيل الدخول، يُرجى إعادة المحاولة."
+    omniauth_confirm_title: "تسجيل الدخول باستخدام %{Provider}"
     omniauth_confirm_button: "متابعة"
+    authenticator_error_no_valid_email: "غير مسموح بعناوين البريد الإلكتروني المرتبطة بحساب %{account}. قد تحتاج إلى إعداد حسابك بعنوان بريد إلكتروني مختلف."
     new_registrations_disabled: "عمليات تسجيل الحسابات الجديدة غير مسموح بها في الوقت الحالي."
     password_too_long: "كلمات المرور محدَّدة بعدد 200 حرف."
     email_too_long: "عنوان البريد الإلكتروني الذي أدخلته طويل جدًا. يجب ألا تتجاوز أسماء صناديق البريد 254 حرفًا، ويجب ألا تزيد أسماء النطاقات عن 253 حرفًا."
+    wrong_invite_code: "رمز الدعوة الذي أدخلته غير صحيح."
     reserved_username: "اسم المستخدم هذا غير مسموح به."
     missing_user_field: "لم تكمل جميع حقول المستخدم."
+    auth_complete: "اكتملت المصادقة."
+    click_to_continue: "اضغط هنا للمتابعة."
+    already_logged_in: "عذرًا! هذه الدعوة مخصَّصة للمستخدمين الجُدد الذين ليس لديهم حساب موجود بالفعل."
     second_factor_title: "المصادقة الثنائية"
+    second_factor_description: "يُرجى إدخال رمز المصادقة المطلوب من تطبيقك:"
     second_factor_backup_description: "يُرجى إدخال أحد الرموز الاحتياطية الخاصة بك:"
+    second_factor_backup_title: "الرمز الثنائي للنسخ الاحتياطي"
+    invalid_second_factor_code: "رمز المصادقة غير صالح. يمكن استخدام كل رمز مرة واحدة فقط."
+    invalid_security_key: "مفتاح الأمان غير صالح."
+    missing_second_factor_name: "يُرجى إدخال اسم."
+    missing_second_factor_code: "يُرجى إدخال رمز."
     second_factor_toggle:
+      totp: "استخدام تطبيق المصادقة أو مفتاح الأمان بدلًا من ذلك"
       backup_code: "استخدام رمز احتياطي بدلًا من ذلك"
   admin:
     email:
       sent_test: "تم الإرسال!"
+    user:
+      merge_user:
+        updating_username: "جارٍ تحديث اسم المستخدم..."
+        changing_post_ownership: "جارٍ تغيير ملكية المنشور..."
+        merging_given_daily_likes: "جارٍ دمج الإعجابات اليومية الممنوحة..."
+        merging_post_timings: "جارٍ دمج توقيتات النشر..."
+        merging_user_visits: "جارٍ دمج زيارات المستخدمين..."
+        updating_site_settings: "جارٍ تحديث إعدادات الموقع..."
+        updating_user_stats: "جارٍ تحديث إحصاءات المستخدمين..."
+        merging_user_attributes: "جارٍ دمج سمات المستخدمين..."
+        updating_user_ids: "جارٍ تحديث معرِّفات المستخدمين..."
+        deleting_source_user: "جارٍ حذف ‏‏المستخدم المصدر..."
   user:
+    deactivated: "تم إلغاء التنشيط بسبب ارتداد عدد كبير جدًا من الرسائل الإلكترونية إلى \"%{email}\"."
+    deactivated_by_staff: "تم إلغاء التنشيط بواسطة فريق العمل"
+    deactivated_by_inactivity:
+      zero: "يتم إلغاء التنشيط تلقائيًا بعد %{count} يوم من عدم النشاط"
+      one: "يتم إلغاء التنشيط تلقائيًا بعد يوم واحد (%{count}) من عدم النشاط"
+      two: "يتم إلغاء التنشيط تلقائيًا بعد يومَين (%{count}) من عدم النشاط"
+      few: "يتم إلغاء التنشيط تلقائيًا بعد %{count} أيام من عدم النشاط"
+      many: "يتم إلغاء التنشيط تلقائيًا بعد %{count} يومًا من عدم النشاط"
+      other: "يتم إلغاء التنشيط تلقائيًا بعد %{count} يوم من عدم النشاط"
+    activated_by_staff: "تم التفعيل بواسطة فريق العمل"
+    new_user_typed_too_fast: "كتب المستخدم الجديد بسرعة كبيرة"
+    content_matches_auto_silence_regex: "يتطابق المحتوى مع التعبير العادي للكتم التلقائي"
+    content_matches_auto_block_regex: "يتطابق المحتوى مع التعبير العادي للحظر التلقائي"
     username:
       short: "يجب ألا يقل عدد الأحرف عن %{min}"
       long: "يجب ألا يزيد عدد الأحرف عن %{min}"
+      too_long: "طويل جدًا"
+      characters: "يجب ألا يتضمَّن سوى الأرقام والحروف والشرطات والنقاط والشرطات السفلية"
       unique: "يجب أن يكون فريدًا"
       blank: "يجب أن يكون موجودًا"
+      must_begin_with_alphanumeric_or_underscore: "يجب أن يبدأ بحرف أو رقم أو شرطة سفلية"
       must_end_with_alphanumeric: "يجب أن ينتهي بحرف أو رقم"
       must_not_contain_two_special_chars_in_seq: "يجب ألا يحتوي على تسلسل من حرفين أو أكثر من الأحرف الخاصة (.-_)"
       must_not_end_with_confusing_suffix: "يجب ألا ينتهي بلاحقة مربكة مثل .json أو .png وما إلى ذلك."
     email:
+      invalid: "غير صالح."
       not_allowed: "غير مسموح به من مقدِّم خدمة البريد الإلكتروني هذا. يُرجى استخدام عنوان بريد إلكتروني آخر."
       blocked: "غير مسموح به."
+      revoked: "لن يتم إرسال الرسائل الإلكترونية إلى \"%{email}\" حتى %{date}."
+      does_not_exist: "غير موجود"
     ip_address:
       blocked: "عمليات التسجيل الجديدة غير مسموح بها من عنوان IP الخاص بك."
       max_new_accounts_per_registration_ip: "عمليات التسجيل الجديدة غير مسموح بها من عنوان IP الخاص بك (تم الوصول إلى الحد الأقصى). تواصل مع أحد أعضاء فريق العمل."
     website:
       domain_not_allowed: "الموقع الإلكتروني غير صالح. النطاقات المسموح بها هي: %{domains}"
+    auto_rejected: "تم الرفض تلقائيًا بسبب العمر. راجع إعداد الموقع `auto_handle_queued_age`."
+    destroy_reasons:
+      unused_staged_user: "المستخدم المؤقت غير مُستخدَم"
+      fixed_primary_email: "عنوان البريد الإلكتروني الأساسي ثابت لمستخدم مؤقت"
+      same_ip_address: "عنوان IP نفسه (%{ip_address}) كمستخدمين آخرين"
+      inactive_user: "المستخدم غير نشط"
+      reviewable_reject_auto: "تم وضع العناصر القابلة للمراجعة في قائمة الانتظار بواسطة التعامل التلقائي"
+      reviewable_reject: "تم رفض المستخدم القابل للمراجعة"
+    email_in_spam_header: "تم الإبلاغ عن الرسالة الإلكترونية الأولى للمستخدم باعتبارها غير مرغوب فيها"
+    already_silenced: "تم بالفعل كتم المستخدم بواسطة %{staff}%{time_ago}."
+    already_suspended: "تم بالفعل تعليق المستخدم بواسطة %{staff}%{time_ago}."
+    cannot_delete_has_posts:
+      zero: "لدى المستخدم %{username} %{count} منشور في الموضوعات العامة أو الرسائل الخاصة؛ لذا لا يمكن حذفه."
+      one: "لدى المستخدم %{username} منشور واحد (%{count}) في الموضوعات العامة أو الرسائل الخاصة؛ لذا لا يمكن حذفه."
+      two: "لدى المستخدم %{username} منشورَين (%{count}) في الموضوعات العامة أو الرسائل الخاصة؛ لذا لا يمكن حذفه."
+      few: "لدى المستخدم %{username} %{count} منشورات في الموضوعات العامة أو الرسائل الخاصة؛ لذا لا يمكن حذفه."
+      many: "لدى المستخدم %{username} %{count} منشورًا في الموضوعات العامة أو الرسائل الخاصة؛ لذا لا يمكن حذفه."
+      other: "لدى المستخدم %{username} %{count} منشور في الموضوعات العامة أو الرسائل الخاصة؛ لذا لا يمكن حذفه."
+  reviewables_reminder:
+    submitted:
+      zero: "تم إرسال العناصر قبل %{count} ساعة. [يُرجى مراجعتها](%{base_path}/review)."
+      one: "تم إرسال العناصر قبل ساعة واحدة (%{count}). [يُرجى مراجعتها](%{base_path}/review)."
+      two: "تم إرسال العناصر قبل ساعتَين (%{count}). [يُرجى مراجعتها](%{base_path}/review)."
+      few: "تم إرسال العناصر قبل %{count} ساعات. [يُرجى مراجعتها](%{base_path}/review)."
+      many: "تم إرسال العناصر قبل %{count} ساعة. [يُرجى مراجعتها](%{base_path}/review)."
+      other: "تم إرسال العناصر قبل %{count} ساعة. [يُرجى مراجعتها](%{base_path}/review)."
+    subject_template:
+      zero: "يجب مراجعة %{count} عنصر"
+      one: "يجب مراجعة عنصر واحد (%{count})"
+      two: "يجب مراجعة عنصرَين (%{count})"
+      few: "يجب مراجعة %{count} عناصر"
+      many: "يجب مراجعة %{count} عنصرًا"
+      other: "يجب مراجعة %{count} عنصر"
   unsubscribe_mailer:
+    title: "رسالة إلغاء الاشتراك"
     subject_template: "التأكيد أنك لم تعُد تريد تلقي تحديثات البريد الإلكتروني من %{site_title}"
+    text_body_template: |
+      طلب شخص ما (ربما أنت؟) عدم إرسال تحديثات البريد الإلكتروني مرة أخرى من %{site_domain_name} إلى هذا العنوان.
+      إذا كنت ترغب في تأكيد ذلك، يُرجى النقر على هذا الرابط:
+
+       %{insurance_unsubscribe_link} [ 1]
+
+
+      إذا كنت ترغب في مواصلة تلقي التحديثات عبر البريد الإلكتروني، يمكنك تجاهل هذا الرسالة الإلكترونية.
+  invite_mailer:
+    title: "رسالة الدعوة"
+    subject_template: "دعاك %{inviter_name} إلى \"%{topic_title}\" على %{site_domain_name}"
+    text_body_template: |
+      دعاك %{inviter_name} إلى مناقشة
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      على
+
+      > %{site_title} -- %{site_description}
+
+      إذا كنت مهتمًا، فانقر على الرابط أدناه:
+
+      %{invite_link}
+  custom_invite_mailer:
+    title: "رسالة الدعوة المخصَّصة"
+    subject_template: "دعاك %{inviter_name} إلى \"%{topic_title}\" على %{site_domain_name}"
+    text_body_template: |
+      دعاك %{inviter_name} إلى مناقشة
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      على
+
+      > %{site_title} -- %{site_description}
+
+      مع هذه الملاحظة
+
+      > %{user_custom_message}
+
+      إذا كنت مهتمًا، فانقر على الرابط أدناه:
+
+      %{invite_link}
+  invite_forum_mailer:
+    title: "رسالة الدعوة إلى منتدى"
+    subject_template: "دعاك %{inviter_name} للانضمام إلى %{site_domain_name}"
+    text_body_template: "دعاك %{inviter_name} للانضمام إلى\n\n> **%{site_title} ** \n> \n>%{site_description}\n\nإذا كنت مهتمًا، فانقر على الرابط أدناه:\n\n%{invite_link}\n"
+  custom_invite_forum_mailer:
+    title: "رسالة الدعوة المخصَّصة إلى منتدى"
+    subject_template: "دعاك %{inviter_name} للانضمام إلى %{site_domain_name}"
+    text_body_template: |
+      دعاك %{inviter_name} للانضمام إلى
+
+      > **%{site_title}**
+      >
+      > %{site_description}
+
+      مع هذه الرسالة المخصَّصة
+
+      > %{user_custom_message}
+
+      إذا كنت مهتمًا، فانقر على الرابط أدناه:
+
+      %{invite_link}
   invite_password_instructions:
+    title: "تعليمات كلمة المرور للدعوة"
     subject_template: "ضبط كلمة المرور لحساب %{site_name}"
+    text_body_template: |
+      شكرًا لقبول دعوتك إلى %{site_name} - مرحبًا!
+
+      انقر على هذا الرابط لاختيار كلمة مرور الآن:
+      %{base_url}/u/password-reset/%{email_token}
+
+      (إذا انتهت صلاحية الرابط أعلاه، فاختر "لقد نسيت كلمة المرور" عند تسجيل الدخول باستخدام عنوان بريدك الإلكتروني.)
+  download_backup_mailer:
+    title: "رسالة تنزيل النسخة الاحتياطية"
+    subject_template: "[%{email_prefix}] تنزيل نسخة احتياطية للموقع"
+    text_body_template: |
+      إليك [رابط تنزيل النسخة الاحتياطية للموقع](%{backup_file_path}) الذي طلبته.
+
+      لقد أرسلنا رابط التنزيل هذا إلى عنوان بريدك الإلكتروني الذي تم التحقُّق منه لأسباب أمنية.
+
+      (إذا *لم* تطلب هذا التنزيل، يجب أن تشعر بالقلق الشديد؛ فهناك شخص ما لديه إذن وصول المسؤول إلى موقعك.)
+    no_token: |
+      عذرًا، تم استخدام رابط تنزيل النسخة الاحتياطية هذا بالفعل أو انتهت صلاحيته.
+  admin_confirmation_mailer:
+    title: "تأكيد المسؤول"
+    subject_template: "[%{email_prefix}] تأكيد حساب مسؤول جديد"
+    text_body_template: |
+      يُرجى تأكيد رغبتك في إضافة **%{target_username} (%{target_email}) ** كمسؤول عن منتداك.
+
+      [تأكيد حساب المسؤول](%{admin_confirm_url})
+  test_mailer:
+    title: "رسالة الاختبار"
+    subject_template: "[%{email_prefix}] اختبار تسليم الرسالة الإلكترونية"
+    text_body_template: |
+      هذه رسالة إلكترونية للاختبار    [**%{base_url}**][0]    إن تسليم الرسائل الإلكترونية عملية معقَّدة. فيما يلي بعض الأمور المهمة التي يجب عليك التحقُّق منها أولًا:    - تأكَّد من ضبط عنوان "من:" في الرسالة الإلكترونية للإشعار `notification email` بشكلٍ صحيح في إعدادات موقعك. **النطاق المحدَّد في عنوان "من" للرسائل الإلكترونية التي ترسلها هو النطاق الذي سيتم التحقُّق من عنوان بريدك الإلكتروني مقابله**.    - تعرَّف على كيفية عرض المصدر البسيط للرسالة الإلكترونية في عميل البريد الخاص بك لتتمكن من فحص رؤوس الرسائل الإلكترونية للحصول على أدلة مهمة. في Gmail، هو خيار "إظهار الأصل" في القائمة المنسدلة في أعلى يمين كل رسالة إلكترونية.    - **مهم: ** هل يحتوي موفِّر خدمة الإنترنت الخاص بك على سجل DNS عكسي تم إدخاله لربط أسماء النطاقات وعناوين IP التي ترسل الرسائل الإلكترونية منها؟ [اختبر سجل PTR العكسي الخاص بك][2] من هنا. إذا لم يُدخِل موفِّر خدمة الإنترنت سجل مؤشر DNS العكسي الصحيح، فمن غير المحتمل تسليم أيٍّ من رسائلك الإلكترونية.    - هل [سجل SPF][8] الخاص بنطاقك صحيح؟ [اختبر سجل SPF الخاص بك][1] من هنا. لاحظ أن TXT هو نوع السجل الرسمي الصحيح لإطار SPF.    - هل [سجل DKIM][3] الخاص بنطاقك صحيح؟ سيؤدي ذلك إلى تحسين إمكانية تسليم الرسائل الإلكترونية بشكلٍ كبير. [اختبر سجل DKIM الخاص بك][7] من هنا.    - إذا شغَّلت خادم البريد الخاص بك، فتأكَّد من أن عناوين IP لخادم البريد الخاص بك [ليست على أي من قوائم حظر عناوين البريد الإلكتروني][4]. تحقَّق أيضًا من أنه يرسل بالتأكيد اسم مضيف مؤهل تمامًا تم تحليله في DNS إلى رسالة HELO الخاصة به. إذا لم يكن الأمر كذلك، فسيؤدي ذلك إلى رفض رسالتك الإلكترونية بواسطة العديد من خدمات البريد.    - نوصيك بشدة **بإرسال رسالة إلكترونية للاختبار إلى [mail-tester.com][mt]** للتحقُّق من أن كل ما سبق يعمل بشكلٍ صحيح.    (الطريقة *السهلة* هي إنشاء حساب على [SendGrid][sg] أو [SparkPost] أو [sp] أو [Mailgun][mg] أو [Mailjet][mj] التي لديها خطط بريدية منخفضة التكلفة وستكون جيدة بالنسبة للمجتمعات الصغيرة. ولكن بالرغم من ذلك، ستظل بحاجة إلى إعداد سجلات SPF و DKIM في DNS الخاص بك!)    نأمل أن تكون قد تلقيت هذه الرسالة الإلكترونية للاختبار بشكلٍ صحيح!    حظًا سعيدًا،    أصدقاؤك في [Discourse](https://www.discourse.org)    [0]: %{base_url}  [1]: https://www.kitterman.com/spf/validate.html  [2]: https://mxtoolbox.com/ReverseLookup.aspx  [3]: http://www.dkim.org/  [4]: https://whatismyipaddress.com/blacklist-check  [7]: https://www.mail-tester.com/spf-dkim-check  [8]: http://www.openspf.org/SPF_Record_Syntax  [sg]: https://goo.gl/r1WMF6  [sp]: https://www.sparkpost.com/  [mg]: https://www.mailgun.com/  [mj]: https://www.mailjet.com/pricing/  [mt]: https://www.mail-tester.com/
   new_version_mailer:
+    title: "رسالة الإصدار الجديد"
     subject_template: "[%{email_prefix}] إصدار جديد من Discourse، يتوفَّر تحديث"
   flag_reasons:
     off_topic: "تم الإبلاغ عن منشورك على أنه **خارج الموضوع**: يشعر المجتمع بأنه غير مناسب للموضوع، كما هو محدَّد حاليًا في العنوان وأول منشور."
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index 0b8a8d23df..0beb9421c3 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -230,6 +230,7 @@ da:
     disabled_errors:
       discourse_connect_enabled: "Invitationer er deaktiveret, fordi DiscourseConnect er aktiveret."
       invalid_access: "Du har ikke tilladelse til at se den ønskede ressource."
+    requires_groups: "Invitation gemt. For at give adgang til det angivne emne skal du tilføje en af følgende grupper: %{groups}."
   bulk_invite:
     file_should_be_csv: "Den overførte fil skal være i csv format."
     max_rows: "De første %{max_bulk_invites} invitationer er blevet sendt. Prøv at opdele filen i mindre dele."
@@ -470,12 +471,6 @@ da:
       Du kan redigere dit forrige svar for at tilføje et citat ved at markere teksten og vælge <b>citér svar</b>-knappen som dukker op.
 
       Det er nemmere for alle at læse emner som har færre detaljerede svar i stedet for mange mindre, individuelle svar.
-    dominating_topic: |
-      ### Lad andre deltage i samtalen
-
-      Dette emne er helt klart vigtigt for dig &ndash; du har skrevet mere end %{percent}% af svarene her.
-
-      Det kunne være endnu bedre, hvis du gav andre mennesker plads til at dele deres synspunkter, også. Kan du invitere dem hertil?
     get_a_room: |
       ### Opfordre alle til at blive involveret i samtalen
 
@@ -1427,6 +1422,7 @@ da:
     ga_version: "Version af Google Universal Analytics der skal benyttes: v3 (analytics.js), v4 (gtag)"
     ga_universal_tracking_code: "Google Universal Analytics tracking code ID, fx: UA-12345678-9; se <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
     moderators_manage_categories_and_groups: "Tillad moderatorer at administrere kategorier og grupper"
+    moderators_change_post_ownership: "Tillad moderatorer at ændre ejerskab af indlæg"
     use_admin_ip_allowlist: "Administratorer kan kun logge ind, hvis de kommer fra en IP-adresse, der er defineret i listen Screenede IP'er (Admin> Logs> Screenede Ip'er)."
     blocked_ip_blocks: "En liste over private IP-blokke, der aldrig bør gennemsøges af Discourse"
     allowed_internal_hosts: "En liste over interne værter, som discourse sikkert kan gennemsøge til brug for oneboxing og andre formål"
@@ -1538,6 +1534,7 @@ da:
     image_preview_jpg_quality: "Kvaliteten af skalerede billedfiler (1 er laveste kvalitet, 99 er bedste kvalitet, 100 for at deaktivere)."
     allow_staff_to_upload_any_file_in_pm: "Tillad personale at overføre filer i PM."
     strip_image_metadata: "Fjern billedmetadata."
+    composer_media_optimization_image_bytes_optimization_threshold: "Mindste billedfilstørrelse for at udløse optimering af klientsiden"
     tl1_requires_topics_entered: "Hvor mange emner en ny bruger skal læse før vedkommende forfremmes til tillidsniveau 1."
     tl1_requires_read_posts: "Hvor mange indlæg en ny bruger skal læse før vedkommende forfremmes til tillidsniveau 1."
     tl1_requires_time_spent_mins: "Hvor mange minutter en ny bruger skal læse indlæg før vedkommende forfremmes til tillidsniveau 1."
@@ -1729,6 +1726,7 @@ da:
     city_for_disputes: "By for tvister"
     shared_drafts_min_trust_level: "Tillad brugere at se og redigere Delte kladder."
     push_notifications_icon: "Emblemikonet, der vises i meddelelseshjørnet. Et monokromatisk PNG på 96×96 med gennemsigtighed anbefales."
+    allow_changing_staged_user_tracking: "Tillad, at en forhåndsoprettet brugers kategori- og mærke notifikationsindstillinger ændres af en administratorbruger."
     errors:
       invalid_email: "Ugyldig e-mail-adresse"
       invalid_username: "Der er ingen bruger med det brugernavn."
@@ -1844,6 +1842,7 @@ da:
     reset_not_allowed_from_ip_address: "Du kan ikke anmode om nulstilling af en adgangskode fra den pågældende IP-adresse."
     suspended: "Du kan ikke logge ind før %{date}."
     suspended_with_reason: "Kontoen er suspenderet indtil %{date}: %{reason}"
+    suspended_with_reason_forever: "Konto suspenderet: %{reason}"
     errors: "%{errors}"
     not_available: "Ikke ledigt. Prøv %{suggestion}?"
     something_already_taken: "Noget gik galt, måske er brugernavnet eller e-mail-adressen allerede registreret. Prøv “Glemt adgangskode“-linket."
@@ -2533,6 +2532,7 @@ da:
     [Afmeld](%{unsubscribe_url}).
   subject_re: "Sv: "
   subject_pm: "[PM] "
+  email_from_without_site: "%{user_name}"
   user_notifications:
     previous_discussion: "Tidligere Svar"
     in_reply_to: "Som svar på"
@@ -2747,6 +2747,17 @@ da:
     account_suspended_forever:
       title: "Konto Suspenderet"
       subject_template: "[%{email_prefix}] Din konto er blevet suspenderet"
+      text_body_template: |
+        Du er blevet suspenderet fra forummet.
+
+        Årsag - %{reason}
+    account_silenced_forever:
+      title: "Konto gjort tavs"
+      subject_template: "[%{email_prefix}] Din konto er blevet bragt til tavshed"
+      text_body_template: |
+        Du er blevet bragt til tavshed fra forummet.
+
+        Årsag - %{reason}
     account_exists:
       title: "Konto findes allerede"
       subject_template: "[%{email_prefix}] Kontoen findes allerede"
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index cc945a3b8c..36e2752485 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -477,12 +477,6 @@ de:
       Du kannst deine letzte Antwort bearbeiten, um ein Zitat hinzuzufügen, indem du den Text auswählst und auf die erscheinende Schaltfläche <b>Zitat</b> klickst.
 
       Es ist für alle einfacher, Themen zu lesen, die wenige umfassende Antworten statt viele kleine und einzelne Antworten haben.
-    dominating_topic: |
-      ### Lass andere an der Unterhaltung teilhaben
-
-      Dieses Thema ist eindeutig wichtig für dich &ndash; du hast mehr als %{percent} % der Antworten hier geschrieben.
-
-      Es könnte sogar noch besser sein, wenn du auch anderen Menschen Raum gibst, ihre Ansichten zu teilen. Möchtest du jemanden einladen?
     get_a_room: |
       ### Ermutige jeden, sich an der Unterhaltung zu beteiligen
 
@@ -1462,7 +1456,6 @@ de:
     detailed_404: "Liefert mehr Details für Benutzer darüber, warum sie keinen Zugriff auf ein spezielles Thema haben. Hinweis: Dies ist weniger sicher, weil Benutzer so herausfinden, ob eine URL zu einem existierenden Thema führt."
     enforce_second_factor: "Zwingt die Benutzer, die Zwei-Faktor-Authentifizierung zu aktivieren. Wähle „all“, um sie für alle Benutzer zu erzwingen. Wähle „staff“, um sie nur für Team-Mitglieder zu erzwingen."
     force_https: "Erzwinge HTTPS für deine Website. ACHTUNG: Aktiviere dies NICHT, bevor HTTPS nicht vollständig eingerichtet ist und auf jeden Fall überall funktioniert! Hast du dein CDN, alle Anmeldungen über soziale Netzwerke, alle externe Logos/Abhängigkeiten geprüft, um sicherzustellen, dass sie auch HTTPS-kompatibel sind?"
-    same_site_cookies: "Verwende Same-Site-Cookies, die alle Angriffsszenarien für Cross-Site-Request-Forgery in unterstützten Browsern verhindern („Lax“ oder „Strict“). Warnung: „Strict“ wird nur auf Websites funktionieren, die eine Anmeldung erzwingen und eine externe Authentifizierungsmethode verwenden."
     summary_score_threshold: "Mindestscore, den ein Beitrag benötigt, um in der „Dieses Thema zusammenfassen“-Ansicht zu erscheinen."
     summary_posts_required: "Mindestanzahl an Beiträgen in einem Thema, bevor „Dieses Thema zusammenfassen“ aktiviert wird. Änderungen dieser Einstellung werden rückwirkend innerhalb einer Woche angewendet."
     summary_likes_required: "Mindestanzahl an „Gefällt mir“ in einem Thema, bevor „Dieses Thema zusammenfassen“ aktiviert wird. Änderungen dieser Einstellung werden rückwirkend innerhalb einer Woche angewendet."
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index 61da18fc50..70fabac115 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -477,12 +477,6 @@ es:
       Puedes editar tu anterior respuesta para añadir una cita. Para ello, selecciona el texto que quieras citar y pulsa el botón <b>citar respuesta</b> que aparecerá.
 
       Es más fácil leer temas que tengan menos respuestas (aunque más profundas), que tener que leer muchas respuestas individuales.
-    dominating_topic: |
-      ### Deja que otras personas se unan a la conversación
-
-      Este tema es claramente importante para ti &ndash; has publicado más del %{percent}% de las respuestas.
-
-      Podría ser mejor todavía si le dieras a otras personas la oportunidad de compartir sus puntos de vista también. ¿Podrías invitarles?
     get_a_room: |
       ### Anima a los demás a participar
 
@@ -1461,7 +1455,6 @@ es:
     detailed_404: "Proporciona más detalles a los usuarios acerca de por qué no pueden acceder a un tema en particular. Nota: esto es menos seguro dado que los usuarios sabrán si una URL enlaza a un tema válido."
     enforce_second_factor: "Obligar a usar la autenticación de dos factores. Seleccionar «all» para obligar a todos y «staff» para obligar solo a usuarios que formen parte del personal."
     force_https: "Forzar al sitio a utilizar solo HTTPS. AVISO: ¡NO actives esta opción a menos que verifiques completamente la configuración y funcione correctamente en todas partes! ¿Has verificado también que el CDN, los inicios de sesión a través de redes sociales y cualquier logo externo / dependencia son compatibles con HTTPS?"
-    same_site_cookies: "Usar las mismas cookies del sitio, eliminan todos los vectores CSRF (falsificación de petición en sitios cruzados) de los navegadores soportados (Lax o Strict). Advertencia: Strict solo funcionará en sitios que fuercen el inicio de sesión y usen un método de autenticación externo."
     summary_score_threshold: "La puntuación mínima requerida para que una publicación se incluya en el «resumen de este tema»"
     summary_posts_required: "Cantidad mínima de publicaciones antes de que 'Resumen de este tema' esté activado. Los cambios a esta configuración se aplicarán retroactivamente dentro de una semana."
     summary_likes_required: "Cantidad mínina de me gusta en un tema para activar «resumen de este tema». Los cambios a esta configuración se aplicarán retroactivamente dentro de una semana."
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index 4c6fbedaed..2a0ce54682 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -478,12 +478,6 @@ fi:
       Voit muokata edellistä viestiäsi ja lisätä siihen lainauksen maalaamalla lainattavan viestin tekstiä ja klikkaamalla ilmestyvää <b>lainaa</b>-painiketta.
 
       On helpompaa lukea ketjua, jossa on vähemmän pidempiä vastauksia kuin sellaista, jossa on paljon lyhyitä yksittäisiä vastauksia.
-    dominating_topic: |
-      ### Anna muidenkin osallistua keskusteluun
-
-      Tämä ketju on selvästikin tärkeä sinulle &ndash; olet kirjoittanut yli %{percent} % vastauksista.
-
-      Ketju voisi olla vieläkin parempi, jos useammilla olisi tilaa jakaa omia näkökulmiaan. Voisit kutsua heitä tänne?
     get_a_room: |
       ### Rohkaise kaikkia osallistumaan keskusteluun
 
@@ -1462,7 +1456,6 @@ fi:
     detailed_404: "Kertoo käyttäjälle tarkemmin, miksi hän ei pääse tiettyyn ketjuun. Huomioi: tämä vaarantaa tietoturvaa, koska käyttäjä saa tietää, että URL osoittaa olemassa olevaan ketjuun."
     enforce_second_factor: "Pakottaa käyttäjät ottamaan kaksivaiheisen tunnistuksen käyttöön. Voit pakottaa sen kaikille valitsemalla \"kaikki\". Vaihtoehto \"henkilökunta\" pakottaa sen vain henkilökunnalle."
     force_https: "Pakota sivusto käyttämään vain HTTPS:ää. VAROITUS: älä ota tätä käyttöön ennen kuin HTTPS on täysin käytössä ja toimii täysin kaikkialla! Tarkastitko käyttämäsi CDN:n, kaikki sosiaaliset kirjautumiset ja kaikki ulkoiset logot ja muut riippuvuudet varmistaaksesi, että ne ovat myös HTTPS-yhteensopivia?"
-    same_site_cookies: "Käytä saman sivuston evästeitä, ne eliminoivat kaikki sivustojenvälisen pyynnön väärennyksen vektorit tuetuilla selaimilla (lax tai strict). Varoitus: strict toimii vain sivustoilla, jotka pakottavat kirjautumisen ja käyttävät ulkoista todennustapaa."
     summary_score_threshold: "Viestin minimipistemäärä, jotta se näytetään ketjun tiivistelmässä."
     summary_posts_required: "Vähimmäismäärä viestejä ketjussa ennen kuin Näytä ketjun tiivistelmä otetaan käyttöön. Muutokset tähän asetukseen otetaan käyttöön taannehtivasti viikon kuluessa."
     summary_likes_required: "Vähimmäismäärä tykkäyksiä ketjussa ennen kuin Näytä ketjun tiivistelmä otetaan käyttöön. Muutokset tähän asetukseen otetaan käyttöön taannehtivasti viikon kuluessa."
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index ce206da5b2..e8d3d6399b 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -478,12 +478,6 @@ fr:
       Vous pouvez modifier votre dernière réponse et ajouter une citation en sélectionnant le texte à citer et en cliquant sur le bouton <b>Citer</b>.
 
       Il est plus facile de lire des discussions comprenant des réponses approfondies plutôt que de nombreuses réponses individuelles brèves.
-    dominating_topic: |
-      ### Laissez d'autres utilisateurs rejoindre la conversation
-
-      Ce sujet semble vraiment important pour vous, vous avez publié plus de %{percent} % des réponses dans cette discussion.
-
-      Il serait peut-être judicieux de laisser d'autres personnes partager leur point de vue. Pourriez-vous les inviter à vous rejoindre ?
     get_a_room: |
       ### Encouragez tout le monde à intervenir dans la discussion
 
@@ -1462,7 +1456,6 @@ fr:
     detailed_404: "Donne plus d'informations aux utilisateurs concernant la raison pour laquelle ils ne peuvent pas accéder à ce sujet en particulier. Note : cela est moins sécurisé car les utilisateurs sauront si une URL pointe vers un sujet valide ou non."
     enforce_second_factor: "Force les utilisateurs à activer l'authentification à deux facteurs. Sélectionner « tous » pour l'appliquer à tous les utilisateurs. Sélectionner « responsables » pour l'appliquer aux responsables uniquement."
     force_https: "Forcer votre site en HTTPS uniquement. ATTENTION : n'activez PAS cette fonction tant que vous n'avez pas vérifié que le HTTPS est complètement configuré et fonctionne absolument partout ! Avez-vous vérifié que vos CDN, vos connexions de réseaux sociaux et tous les logos/dépendances tiers sont eux aussi compatibles avec HTTPS ?"
-    same_site_cookies: "Délivrer des cookies avec l'attribut SameSite. Cela permet d'éliminer tous les vecteurs de requêtes illégitimes par rebond (attaques de type « CSRF ») dans les navigateurs qui le prennent en charge (en mode « Lax » ou « Strict »). Attention : le mode « Strict » ne fonctionnera que sur des sites qui imposent l'authentification et qui utilisent un système d'authentification externe."
     summary_score_threshold: "Le score minimal pour qu'un message soit inclus dans le résultat de « Résumer ce sujet »"
     summary_posts_required: "Nombre minimal de messages dans un sujet avant que la fonctionnalité « Résumer ce sujet » soit activée. Les modifications de ce paramètre sont appliquées rétroactivement sur une semaine."
     summary_likes_required: "Nombre minimal de « J'aime » dans un sujet avant que la fonctionnalité « Résumer ce sujet » soit activée. Les modifications de ce paramètre sont appliquées rétroactivement sur une semaine."
diff --git a/config/locales/server.gl.yml b/config/locales/server.gl.yml
index a929063c6d..cf9b23a369 100644
--- a/config/locales/server.gl.yml
+++ b/config/locales/server.gl.yml
@@ -463,12 +463,6 @@ gl:
       Pode editar a súa resposta e engadir unha cita seleccionando o texto e premendo no botón <b>citar resposta</b> que aparece.
 
       É máis sinxelo para a comunidade ler temas con menos respostas, pero con máis contido, que moitas respostas pequenas e individuais.
-    dominating_topic: |
-      ### Permita que máis xente se una á conversa
-
-      Está claro que este tema lle importa &ndash; publicou máis do %{percent}% das respostas.
-
-      Aínda podería ser mellor se lles dese espazo a outras persoas para compartiren o seu punto de vista. Que tal se as convida?
     get_a_room: |
       ###Anime a todos a participar na conversa
 
@@ -1418,7 +1412,6 @@ gl:
     detailed_404: "Proporciónalles máis información aos usuarios sobre os motivos polos que non poden acceder a un tema en concreto. Nota: isto é menos seguro porque os usuarios saberán se o URL liga cun tema válido."
     enforce_second_factor: "Obriga os usuarios a activar a autenticación de dobre paso. Seleccione «todo» para aplicalo a todos os usuarios. Seleccione «equipo» para forzalo en usuarios do equipo."
     force_https: "Forzar o sitio a utilizar só HTTPS. AVISO: NON active esta opción ata que verifique completamente a configuración e esta funcione correctamente en todas as partes! Comprobou tamén que o CDN, os inicios de sesión a través de redes sociais e calquera logo externo/dependencia son compatibles con HTTPS?"
-    same_site_cookies: "Utilizar os mesmos rastros do sitio; eliminan todos os vectores CSRF -falsificación de petición en sitios cruzados- dos navegadores compatíbeis (laxo ou estrito). AVISO: O estrito só funcionará en sitios que forcen o inicio de sesión e utilicen un método externo de autenticación."
     summary_score_threshold: "A puntuación mínima que se require para que unha publicación sexa incluída en «Resumir este tema»."
     summary_posts_required: "Número mínimo de publicacións antes de que «Resumir este tema» estea activado. Os cambios neste axuste aplicaranse retroactivamente despois dunha semana."
     summary_likes_required: "Número mínimo de gústame nun tema antes de que «Resumir este tema» estea activado. Os cambios neste axuste aplicaranse retroactivamente despois dunha semana."
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 7777bb0235..9f4c28173d 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -530,12 +530,6 @@ he:
       ניתן לערוך תגובות קודמות שלך כדי להוסיף ציטוט על ידי סימון טקסט ובחירה בכפתור שנגלה <b>ציטוט תגובה</b>.
 
       יותר קל לכולם לקרוא נושאים שיש בהם פחות תגובות עמוקות מאשר הרבה תגובות קטנות.
-    dominating_topic: |
-      ### לאפשר לזולת לקחת חלק בדיון
-
-      נושא זה בהחלט חשוב בעיניך &ndash; פרסמת בו למעלה מ־%{percent}% מהתגובות.
-
-      הדיון הזה עשוי עוד להשתפר אם יצטרפו אליו אנשים עם גישות שונות בנוסף. למה שלא להזמין אותם?
     get_a_room: |
       ### מומלץ לעודד את כולם להשתתף בדיון
 
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index f15e292bac..01f6c7d5e2 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -481,10 +481,6 @@ it:
       Puoi modificare la risposta precedente per aggiungere una citazione evidenziando il testo e selezionando il pulsante <b>Cita</b> che comparirà.
 
       E' più facile per chiunque leggere argomenti che hanno poche risposte ma più dettagliate, rispetto a molte brevi risposte singole.
-    dominating_topic: |
-      ### Consenti ad altri di partecipare alla conversazione Questo argomento è chiaramente importante per te&ndash;: hai pubblicato più di %{percent}% delle risposte.
-
-      Potrebbe essere ancora meglio se dessi ad altre persone lo spazio per condividere anche i loro punti di vista. Puoi invitarli?
     get_a_room: "### Incoraggia tutti a partecipare alla conversazione\n\nHai risposto %{count} volte a @%{reply_username} in questo particolare argomento! \n\nUna grande discussione vede protagoniste molte voci e punti di vista. Ti va di coinvolgere qualcun altro? \n\nE non dimenticare, se desideri continuare la tua conversazione in privato con questo particolare utente, [puoi inviargli un messaggio personale](%{base_path}/u/%{reply_username}).\n"
     too_many_replies: |
       ### Hai raggiungo il limite di risposte per questo argomento
@@ -1458,7 +1454,6 @@ it:
     detailed_404: "Fornisce maggiori dettagli agli utenti sul perché non possono accedere a un argomento specifico. Nota: questo metodo è meno sicuro perché gli utenti sapranno se un URL si collega a un argomento valido."
     enforce_second_factor: "Impone agli utenti di abilitare l'autenticazione a due fattori. Seleziona \"all\" per applicarlo a tutti gli utenti. Seleziona \"staff\" per applicarlo solo agli utenti staff."
     force_https: "Forza il tuo sito ad usare solo HTTPS. ATTENZIONE: NON abilitare questa opzione finché non hai verificato che HTTPS è pienamente configurato e sta funzionando ovunque! Hai verificato il tuo CDN, tutti gli accessi ai social ed ogni logo esterno / dipendenze per essere sicuro che sono anch'essi tutti compatibili con HTTPS?"
-    same_site_cookies: "Utilizza gli stessi cookie del sito. In tal modo si eliminano tutti i vettori Cross Site Request Forgery nei browser supportati (Lax o Strict). Avviso: Strict funzionerà solo su siti che richiedono l'accesso e utilizzano un metodo di autenticazione esterno."
     summary_score_threshold: "Il punteggio minimo richiesto affinché un messaggio sia incluso in 'Riassumi Questo Argomento'"
     summary_posts_required: "Numero minimo di messaggi in un argomento prima che l'opzione 'Riassumi questo argomento' sia abilitata. Le modifiche a questa impostazione verranno applicate retroattivamente entro una settimana."
     summary_likes_required: "Minimo numero di \"Mi piace\" in un argomento prima che l'opzione 'Riassumi questo argomento' sia abilitata. Le modifiche a questa impostazione verranno applicate retroattivamente entro una settimana."
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index 8f16bafd8c..7c20142ba5 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -42,13 +42,13 @@ ja:
   views: " 閲覧"
   loading: "読み込み中"
   powered_by_html: '<a href="https://www.discourse.org">Discourse</a> により提供されています。最適な表示のために、Javascript を有効にしてください。'
-  sign_up: "サインアップ"
+  sign_up: "アカウントを登録"
   log_in: "ログイン"
   submit: "送信"
   purge_reason: "放置・無効アカウントとして自動的に削除されました。"
   disable_remote_images_download_reason: "ディスク容量が不足しているため、リモート画像のダウンロードは無効化されました。"
   anonymous: "匿名"
-  remove_posts_deleted_by_author: "作者によって削除"
+  remove_posts_deleted_by_author: "作成者によって削除"
   redirect_warning: "選択されたリンクがこのフォーラムに実際に投稿されていることを確認できませんでした。このまま進むには、下のリンクを選択してください。"
   on_another_topic: "別のトピック"
   inline_oneboxer:
@@ -218,12 +218,12 @@ ja:
 
       <p>そうでない場合は、<a href="%{base_url}/password-reset">パスワードをリセット</a>してください。</p>
     not_found_template_link: |
-      <p><a href="%{base_url}">%{site_name}</a> への招待を引き換えられなくなりました。あなたを招待した人に新しい招待状を送るようリクエストしてください。</p>
+      <p><a href="%{base_url}">%{site_name}</a> への招待を引き換えられなくなりました。あなたを招待した人に新しい招待を送るようリクエストしてください。</p>
     user_exists: "<b>%{email}</b> を招待する必要はありません。 <a href='%{base_path}/u/%{username}/summary'> のアカウントはすでに存在します！</a>"
     invite_exists: "<b>%{email}</b> はすでに招待済みです。"
     invalid_email: "%{email} は有効なメールアドレスではありません。"
     rate_limit:
-      other: "最終日に %{count} 通の招待状を送信済みです。%{time_left} 待ってからもう一度お試しください。"
+      other: "過去 24 時間以内に %{count} 通の招待を送信済みです。%{time_left} 待ってからもう一度お試しください。"
     confirm_email: "<p>ほぼ完了です！メールアドレスにアクティベーションメールを送信しました。メールに記載の手順に従って、アカウントを確認してください。</p><p>まだ届いていない場合は、迷惑フォルダを確認してください。</p>"
     cant_invite_to_group: "指定したグループにユーザーを招待することはできません。招待しようとしているグループのオーナーであることを確認してください。"
     disabled_errors:
@@ -456,12 +456,6 @@ ja:
       前の返信を編集する際に、テキストをハイライトして<b>引用して返信</b>ボタンを選択すると、返信に引用を追加することができます。
 
       短い個別の返信を多数読むよりも、詳細な返信を数件読む方が、トピックをフォローしやすくなります。
-    dominating_topic: |
-      ### ほかのユーザーを会話に参加させましょう
-
-      %{percent} 件以上の返信をここに投稿しているわけですから、このトピックがあなたにとって重要であることは明確です。
-
-      ほかのユーザーにも意見を共有できる余裕を与えれば、さらに改善されるでしょう。ほかのユーザーを招待しませんか？
     get_a_room: |
       ### 全員が会話に参加できるように奨励しましょう
 
@@ -525,7 +519,7 @@ ja:
             name:
               same_as_password: "はあなたのパスワードと同じです。"
             ip_address:
-              signup_not_allowed: "このアカウントからサインアップできません。"
+              signup_not_allowed: "このアカウントから登録できません。"
         user_profile:
           attributes:
             featured_topic_id:
@@ -563,7 +557,7 @@ ja:
         watched_word:
           attributes:
             word:
-              too_many: "そのアクションには語が多すぎます"
+              too_many: "その操作には語が多すぎます"
             base:
               invalid_url: "置換 URL は無効です"
       <<: *errors
@@ -578,7 +572,7 @@ ja:
     title: "Discourse へようこそ"
     body: |2
 
-      この固定トピックの最初の写真は、ウェルカムメッセージとしてホームページを初めて訪問するすべてのユーザーに表示されるものであるため、重要です！
+      この固定トピックの最初の写真は、ようこそメッセージとしてホームページを初めて訪問するすべてのユーザーに表示されるものであるため、重要です！
 
       コミュニティの簡単な説明になるように、**これを編集**しましょう。
 
@@ -836,8 +830,8 @@ ja:
       short_description: "この投稿をブックマークする"
     like:
       title: "いいね！"
-      description: "この投稿を「いいね！」する"
-      short_description: "この投稿を「いいね！」する"
+      description: "この投稿に「いいね！」する"
+      short_description: "この投稿に「いいね！」する"
   draft:
     sequence_conflict_error:
       title: "下書きエラー"
@@ -903,7 +897,7 @@ ja:
       title: "その他"
       description: 'このトピックは<a href="%{base_path}/guidelines">ガイドライン</a>、<a href="%{tos_url}">利用規約</a>または上記に記載されていない別の理由で、一般のスタッフによる注意が必要です。'
       long_form: "モデレーターの注意要として通報"
-      short_description: "その他の理由でスタッフによる注意が必要"
+      short_description: "その他の理由でスタッフの注意が必要"
       email_title: 'トピック "%{title}" はモデレーターの注意が必要です'
       email_body: "%{link}\n\n%{message}"
   flagging:
@@ -1061,7 +1055,7 @@ ja:
       labels:
         post: 投稿
         editor: 編集者
-        author: 作者
+        author: 作成者
         edit_reason: 理由
     dau_by_mau:
       title: "DAU/MAU"
@@ -1156,7 +1150,7 @@ ja:
       yaxis: "メッセージ件数"
       description: "モデレーターからの個人メッセージで送信された警告の数。"
     notify_moderators_private_messages:
-      title: "管理人に通知"
+      title: "モデレーターに通知"
       xaxis: "日"
       yaxis: "メッセージ件数"
       description: "モデレーターが通報によって非公開に通知された回数。"
@@ -1373,10 +1367,10 @@ ja:
     editing_grace_period_max_diff: "編集猶予期間で変更が許可される最大文字数。さらに変更された場合は別の投稿リビジョンを保存します (信頼レベル 0 および 1)"
     editing_grace_period_max_diff_high_trust: "編集猶予期間で変更が許可される最大文字数。さらに変更された場合は別の投稿リビジョンを保存します (信頼レベル 2 以上 )"
     staff_edit_locks_post: "スタッフメンバーが編集した投稿は編集できなくなります"
-    post_edit_time_limit: "TL0 または TL1 作者は投稿後 (n) 分間、投稿を編集できる。0 に設定すると永久に編集できます。"
-    tl2_post_edit_time_limit: "TL2 以上の作者は投稿後 (n) 分間、投稿を編集できる。0 に設定すると永久に編集できます。"
+    post_edit_time_limit: "TL0 または TL1 作成者は投稿後 (n) 分間、投稿を編集できる。0 に設定すると永久に編集できます。"
+    tl2_post_edit_time_limit: "TL2 以上の作成者は投稿後 (n) 分間、投稿を編集できる。0 に設定すると永久に編集できます。"
     edit_history_visible_to_public: "編集した投稿の前のバージョンをすべてのユーザーが閲覧することを許可する。無効である場合、スタッフメンバーのみが閲覧できます。"
-    delete_removed_posts_after: "作者が削除した投稿は (n) 時間後に自動的に削除される。0 に設置すると、投稿は直ちに削除されます。"
+    delete_removed_posts_after: "作成者が削除した投稿は (n) 時間後に自動的に削除される。0 に設置すると、投稿は直ちに削除されます。"
     max_image_width: "投稿内のサムネイル画像の最大幅"
     max_image_height: "投稿内のサムネイル画像の最大高"
     responsive_post_image_sizes: "ライトボックスのプレビュー画像のサイズを変更して、次のピクセル比の DPI の高いスクリーンを可能にします。レスポンシブ画像を無効にするには、すべての値を削除します。"
@@ -1415,7 +1409,6 @@ ja:
     detailed_404: "特定のトピックにアクセスできない詳細な理由をユーザーに提供します。注意: URL が有効なトピックにリンクしているかどうかがユーザーにわかるため、安全性が低くなります。"
     enforce_second_factor: "ユーザーが二要素認証を有効にするように強制します。すべてのユーザーに適用する場合は 'すべて' を選択します。スタッフユーザーのみに適用する場合は 'スタッフ' を選択します。"
     force_https: "サイトが HTTPS のみを使用するように強制する。警告: HTTPS が完全にセットアップ済みであり、すべての場所で機能していることを確認するまで、これを有効にしないでください！CDN、すべてのソーシャルログイン、および外部ロゴ/依存関係がすべて HTTPS 対応であることを確認しましたか？"
-    same_site_cookies: "同じサイト Cookie を使用する。サポートされているブラウザですべてのクロスサイトリクエストフォージェリ攻撃を排除します (Lax または Strict)。Strict は、ログインと外部認証方式の使用を強制するサイトでのみ動作します。"
     summary_score_threshold: "「このトピックを要約」に含まれるために必要な投稿の最低スコア"
     summary_posts_required: "'このトピックを要約' を有効にするために最低限必要なトピック内の投稿数。この設定を変更すると、1 週間以内で遡って適用されます。"
     summary_likes_required: "'このトピックを要約' を有効にするために最低限必要なトピック内の「いいね！」数。この設定を変更すると、1 週間以内で遡って適用されます。"
@@ -1429,7 +1422,7 @@ ja:
     long_polling_interval: "送信するデータが存在しない場合に、サーバーがクライアントに応答するまで待機する時間 (ログインユーザーのみ)"
     polling_interval: "ロングポーリングではないときの、ログイン済みクライアントのポーリング間隔 (ミリ秒)"
     anon_polling_interval: "匿名クライアントのポーリング間隔 (ミリ秒)"
-    background_polling_interval: "ウィンドウがバックグラウンド時のクライアントのポーリング間隔（ミリ秒)"
+    background_polling_interval: "ウィンドウがバックグラウンド時のクライアントのポーリング間隔 (ミリ秒)"
     hide_post_sensitivity: "通報された投稿が非表示になる確率"
     silence_new_user_sensitivity: "新規ユーザーが迷惑通報に基づいて投稿禁止にされる確率"
     auto_close_topic_sensitivity: "通報されたトピックが自動的にクローズされる確率"
@@ -1490,8 +1483,8 @@ ja:
     share_links: "共有ダイアログに表示する項目、表示順を指定。"
     site_contact_username: "自動送信メールの from に使用される有効なスタッフのユーザー名。空欄の場合デフォルトのシステムアカウントが使用されます。"
     site_contact_group_name: "すべての自動メッセージに招待される有効なグループ名。"
-    send_welcome_message: "すべての新規ユーザーにクイックスタートガイド付きのウェルカムメッセージを送信する。"
-    send_tl1_welcome_message: "新しい信頼レベル 1 のユーザーにウェルカムメッセージを送信します。"
+    send_welcome_message: "すべての新規ユーザーにクイックスタートガイド付きのようこそメッセージを送信する。"
+    send_tl1_welcome_message: "新しい信頼レベル 1 のユーザーにようこそメッセージを送信します。"
     send_tl2_promotion_message: "新しい信頼レベル 2 ユーザーに昇格に関するメッセージを送信します。"
     suppress_reply_directly_below: "投稿に返信が 1 つしかない場合、投稿の展開可能な返信数を表示しない。"
     suppress_reply_directly_above: "投稿に返信が 1 つしかない場合、投稿の展開可能な in-reply-to を表示しない。"
@@ -1701,7 +1694,7 @@ ja:
     max_mentions_per_post: "すべてのユーザーが投稿内で @name 通知を行える最大数"
     max_users_notified_per_group_mention: "グループがメンションされたときに通知を受信するユーザーの最大数 (しきい値に達した場合、通知は発生しません)"
     enable_mentions: "ユーザーによるほかのユーザーのメンションを許可する。"
-    create_thumbnails: "大きすぎて投稿に収まらないが画像のサムネイルを作成し、ライトボックにします。"
+    create_thumbnails: "大きすぎて投稿に収まらないが画像のサムネイルを作成し、ライトボックスにします。"
     email_time_window_mins: "ユーザーに最終編集の機会を与えられるよう、通知メールを送信するまで (n) 分待機する。"
     personal_email_time_window_seconds: "ユーザーがメッセージの最終編集を行えるよう、 (n) 秒待ってから個人メッセージの通知メールを送信する。"
     email_posts_context: "通知メールにコンテキストとして含める以前の返信の件数。"
@@ -1758,7 +1751,7 @@ ja:
     num_flaggers_to_close_topic: "トピックを自動的に停止して介入するために必要なユニーク通報ユーザーの最小数"
     num_hours_to_close_topic: "介入目的でトピックを一時呈する時間数。"
     auto_respond_to_flag_actions: "通報を解除したときの自動返信を有効にします。"
-    min_first_post_typing_time: "最初の投稿時にユーザーが入力する必要のある最低時間 (ミリ秒)。しきい値を満たさない場合、投稿は自動的に要承認キューに追加されます。無効にするには 0 を設定します (非推奨)"
+    min_first_post_typing_time: "最初の投稿時にユーザーが入力する必要のある最低時間 (ミリ秒)。しきい値を満たさない場合、投稿は自動的に承認待ちキューに追加されます。無効にするには 0 を設定します (非推奨)"
     auto_silence_fast_typers_on_first_post: "min_first_post_typing_time を満たさないユーザーを自動的に投稿禁止にする"
     auto_silence_fast_typers_max_trust_level: "高速タイパーを自動的に投稿禁止する最高信頼レベル"
     auto_silence_first_post_regex: "大文字と小文字を区別しない正規表現。合格すると、ユーザーの最初の投稿は投稿禁止になり、承認キューに送られます。例: aging|a[bc]a はまず、「raging」または「aba」または「aca」を含むすべての投稿を投稿禁止にします。最初の投稿のみに適用されます。使用廃止: 代わりに「ウォッチ語の投稿禁止」を使用してください"
@@ -1843,7 +1836,7 @@ ja:
     automatically_download_gravatars: "アカウントの作成時またはメールアドレスの変更時にユーザーの Gravatar をダウンロードします。"
     digest_topics: "メールの要約に表示する人気のあるトピックの最大数。"
     digest_posts: "メールの要約に表示する人気のある投稿の最大数。"
-    digest_other_topics: "メールの要約の 'フォローしているトピックとカテゴリの新着' セクションに表示されるトピックの最大数。"
+    digest_other_topics: "メールの要約の 'フォローしているトピックとカテゴリの新規' セクションに表示されるトピックの最大数。"
     digest_min_excerpt_length: "メールの要約に記載されている投稿の抜粋の最低文字数。"
     suppress_digest_email_after_days: "(n) 日以上サイトにアクセスしていないユーザーの要約メールを非表示する。"
     digest_suppress_categories: "要約メールからこれらのカテゴリを非表示にする。"
@@ -1904,7 +1897,7 @@ ja:
     full_name_required: "ユーザープロフィールのフルネームを必須にします。"
     enable_names: "ユーザーのプロフィール、ユーザーカード、メールアドレスでのフルネームを表示します。無効にすると、フルネームはすべての場所で非表示になります。"
     display_name_on_posts: "投稿に、@username に加えてユーザーのフルネームを表示します。"
-    show_time_gap_days: "２つの投稿の作成日の間が指定された日数以上の場合、トピックに時間の差を表示します。"
+    show_time_gap_days: "2 つの投稿の作成日の間が指定された日数以上の場合、トピックに時間の差を表示します。"
     short_progress_text_threshold: "トピック内の投稿数が指定された数字を超えると、プログレスバーに現在の投稿番号のみを表示します。プログレスバーの幅を変更すると、この値を変更する必要がある場合があります。"
     default_code_lang: "Github コードブロックにデフォルトで適用されるプログラム言語シンタックスハイライト (auto、nohighlight、ruby、python など)"
     warn_reviving_old_topic_age: "最後の返信が指定された日数より古いトピックに返信し始めると、警告を表示します。0 に設定すると無効になります。"
@@ -2100,7 +2093,7 @@ ja:
     blank_id_error: "`external_id` は必須ですが空白になっています"
     email_error: "メールアドレス <b>%{email}</b> でアカウントを登録できませんでした。サイトの管理者にお問い合わせください。"
     missing_secret: "シークレットが欠落しているため、認証に失敗しました。この問題を修正するには、サイト管理者にお問い合わせください。"
-    invite_redeem_failed: "招待状の引き換えに失敗しました。サイトの管理者にお問い合わせください。"
+    invite_redeem_failed: "招待の引き換えに失敗しました。サイトの管理者にお問い合わせください。"
   original_poster: "元の投稿者"
   most_recent_poster: "最も最近の投稿者"
   frequent_poster: "頻繁な投稿者"
@@ -2189,7 +2182,7 @@ ja:
     not_available: "利用できません。%{suggestion}を試しますか？"
     something_already_taken: "エラーが発生しました。ユーザー名またはメールアドレスがすでに登録されている可能性があります。パスワードリセットを行ってください。"
     omniauth_error:
-      generic: "アカウントを認証中にエラーが発生しました。もう一度やり直してください。"
+      generic: "アカウントを認証中にエラーが発生しました。もう一度お試しください。"
       csrf_detected: "認証がタイムアウトしたか、ブラウザを切り替えました。もう一度お試しください。"
       request_error: "認証を開始中にエラーが発生しました。もう一度お試しください。"
       invalid_iat: "サーバークロックの差により認証トークンを検証できません。もう一度お試しください。"
@@ -2565,7 +2558,7 @@ ja:
 
         ‐ この新しいアカウント **%{username}** をあなたのために作成しました。[ユーザープロフィール][prefs]にアクセスして、名前またはパスワードを変更してください。
 
-        ‐ ログインする際は、**元の招待状と同じメールアドレスを使用**してください。異なるものを使用すると、あなたであることがわかりません！
+        ‐ ログインする際は、**元の招待と同じメールアドレスを使用**してください。異なるものを使用すると、あなたであることがわかりません！
 
         %{new_user_tips}
 
@@ -2631,12 +2624,12 @@ ja:
     bulk_invite_succeeded:
       title: "一括招待に成功しました"
       subject_template: "ユーザーの一括招待に成功しました"
-      text_body_template: "ユーザーの一括招待ファイルが処理され、%{sent} 件の招待状が送信されました。"
+      text_body_template: "ユーザーの一括招待ファイルが処理され、%{sent} 件の招待が送信されました。"
     bulk_invite_failed:
       title: "一括招待に失敗しました"
       subject_template: "ユーザーの一括招待中にエラーが発生しました"
       text_body_template: |
-        あなたの一括ユーザー招待ファイルは処理されました。招待状を %{sent} 通メール送信し、%{failed} 個のエラーが発生しました。
+        あなたの一括ユーザー招待ファイルは処理されました。招待を %{sent} 通メール送信し、%{failed} 個のエラーが発生しました。
 
         こちらがログです。
 
@@ -2774,8 +2767,8 @@ ja:
 
         より詳細な会話を促進するため、非常に短い返信は許可されていません。%{count} 文字以上で返信してください。または、"+1" と返信すれば、メールを介して投稿に「いいね！」することができます。
     email_reject_invalid_post_action:
-      title: "メールの拒否 - 無効な投稿アクション"
-      subject_template: "[%{email_prefix}] メールの問題 -- 無効な投稿アクション"
+      title: "メールの拒否 - 無効な投稿操作"
+      subject_template: "[%{email_prefix}] メールの問題 -- 無効な投稿操作"
       text_body_template: |
         %{destination} へのメールメッセージ (件名:「%{former_title}」) は送信されませんでした。
 
@@ -2982,7 +2975,7 @@ ja:
 
         [サイトダッシュボードにアクセス](%{base_url}/admin)して、それらをご覧ください。
 
-        ダッシュボードに何も表示されない場合は、別のスタッフメンバーがすでにこのアドバイスに対応した可能性があります。スタッフアクションのリストは[スタッフアクションログ](%{base_url}/admin/logs/staff_action_logs)をご覧ください。
+        ダッシュボードに何も表示されない場合は、別のスタッフメンバーがすでにこのアドバイスに対応した可能性があります。スタッフ操作のリストは[スタッフ操作ログ](%{base_url}/admin/logs/staff_action_logs)をご覧ください。
     new_user_of_the_month:
       title: "あなたは今月の新規ユーザーです！"
       subject_template: "あなたは今月の新規ユーザーです！"
@@ -3492,7 +3485,7 @@ ja:
     user_email_notification_already_read: "このメールに関する通知は既読です"
     user_email_notification_topic_nil: "post.topic は NIL です"
     user_email_post_user_deleted: "投稿のユーザーは削除されました。"
-    user_email_post_deleted: "投稿は作者によって削除されました"
+    user_email_post_deleted: "投稿は作成者によって削除されました"
     user_email_user_suspended: "ユーザーは凍結状態です"
     user_email_already_read: "ユーザーはこの投稿を閲覧済みです"
     user_email_access_denied: "ユーザーはこの投稿を閲覧できません"
@@ -3921,7 +3914,7 @@ ja:
       name: メンバー
       description: 招待、グループメッセージ、「いいね！」の増加を<a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">付与</a>しました
       long_description: |
-        このバッジは、信頼レベル 2 に達すると付与されます。数週間にわたって、コミュニティにしっかりと参加していただきありがとうございました。ユーザーページまたは個別のトピックからの招待状の送信、グループ個人メッセージの作成、1 日の「いいね！」の増量が付与されています。
+        このバッジは、信頼レベル 2 に達すると付与されます。数週間にわたって、コミュニティにしっかりと参加していただきありがとうございました。ユーザーページまたは個別のトピックからの招待の送信、グループ個人メッセージの作成、1 日の「いいね！」の増量が付与されています。
     regular:
       name: レギュラー
       description: カテゴリ整理、名前変更、フォローリンク、ウィキ、「いいね！」の増加を<a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">付与</a>しました
@@ -3931,7 +3924,7 @@ ja:
       name: リーダー
       description: グローバル編集、固定、クローズ、アーカイブ、分割とマージ、「いいね！」の増加を<a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">付与</a>しました
       long_description: |
-        このバッジは、信頼レベル 4 に達すると付与されます。あなたはこのコミュニティのリーダーとしてスタッフに選ばれ、ここでのあなたのアクションや言葉でコミュニティの他のメンバーに前向きな姿勢を示しています。すべての投稿を編集できるほか、表示固定、クローズ、リストから非表示、アーカイブ、分割、マージなどの一般的なトピックモデレーターアクションを実行できるようになりました。
+        このバッジは、信頼レベル 4 に達すると付与されます。あなたはこのコミュニティのリーダーとしてスタッフに選ばれ、ここでのあなたの行動や言葉でコミュニティの他のメンバーに前向きな姿勢を示しています。すべての投稿を編集できるほか、表示固定、クローズ、リストから非表示、アーカイブ、分割、マージなどの一般的なトピックモデレーターアクションを実行できるようになりました。
     welcome:
       name: ようこそ
       description: '「いいね！」をゲット'
@@ -3948,17 +3941,17 @@ ja:
       long_description: |
         このバッジは、1 年間メンバーであり、その年に少なくとも 1 件の投稿がある場合に付与されます。参加を続け、コミュニティに貢献していただきありがとうございました。あなたなしでは続けられません。
     nice_post:
-      name: ナイスな返事
+      name: ナイスな返信
       description: 返信に 10 個の「いいね！」を受け取りました
       long_description: |
         このバッジは、あなたの返信に「いいね！」が 10 個つけられたときに付与されます。あなたの返信はコミュニティに感動を与え、会話を前進させるのに役立ちました。
     good_post:
-      name: イカした返事
+      name: イカした返信
       description: 返信に 25 個の「いいね！」を受け取りました
       long_description: |
         このバッジは、あなたの返信に「いいね！」が 25 個つけられたときに付与されます。あなたの返信は並外れており、会話をはるかに面白いものにしました。
     great_post:
-      name: グレートな返事
+      name: グレートな返信
       description: 返信に 50 個の「いいね！」を受け取りました
       long_description: |
         このバッジは、あなたの返信に「いいね！」が 50 個つけられたときに付与されます。わぉ！あなたの返信は刺激的、魅力的、陽気、もしくは洞察に満ちていて、コミュニティにとても気に入られました！
@@ -4179,7 +4172,7 @@ ja:
       button: "登録"
       title: "管理者アカウントの登録"
       help: "まず、新しいアカウントを登録してください"
-      no_emails: "残念ながら、セットアップ中に管理者メールが定義されなかったため、構成を完了するのが困難です。構成ファイルに開発者のメールを追加するか、<a href='https://meta.discourse.org/t/create-admin-account-from-console/17274'>コンソールから管理者アカウントを作成</a>してください。"
+      no_emails: "残念ながら、セットアップ中に管理者メールが定義されなかったため、構成を完了するのが困難です。構成ファイルに開発者のメールアドレスを追加するか、<a href='https://meta.discourse.org/t/create-admin-account-from-console/17274'>コンソールから管理者アカウントを作成</a>してください。"
     confirm_email:
       title: "メールの確認"
       message: "<p><b>%{email}</b> にアクティベーションメールを送信しました。メールに記載の指示に従って、アカウントを有効化してください。</p><p>そのメールが届かない場合は、迷惑フォルダをご確認の上、<a href='https://meta.discourse.org/t/troubleshooting-email-on-a-new-discourse-install/16326'>メールが正しくセットアップされていることを確認</a>してください。</p>"
@@ -4324,7 +4317,7 @@ ja:
       invites:
         title: "スタッフの招待"
         description: "ほぼ完了です！コミュニティを始動させるために、興味深いトピックや返信で<a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>ディスカッションを生み出せる</a>人を何人が招待しましょう。"
-        disabled: "ローカルログインが無効になっているため、誰にも招待状を送れません。次のステップに進んでください。"
+        disabled: "ローカルログインが無効になっているため、誰にも招待を送れません。次のステップに進んでください。"
       finished:
         title: "あなたの Discourse の準備が整いました！"
         description: |
@@ -4346,7 +4339,7 @@ ja:
       watching_first_post: '%{username} が新規トピック「%{topic}」を作成しました - %{site_title}'
       confirm_title: "通知を有効にしました - %{site_title}"
       confirm_body: "成功！通知を有効にしました！"
-      custom: "%{site_title} の %{username} からの通知"
+      custom: "%{username} からの通知（%{site_title}）"
   staff_action_logs:
     not_found: "は見つかりません"
     unknown: "不明"
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index bb72e1c3fa..d71536036d 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -456,12 +456,6 @@ ko:
       글을 드래그해서 선택한 다음에, 표시되는 '답글 인용하기'버튼을 눌러서 답글을 추가하는 식으로 쓰신 답글을 편집할 수 있습니다.
 
       다른 사람도 깨알같이 흩어진 답글을 읽는 것 보다는, 깊이 있게 작성된 몇개의 답글을 읽는 편이 토픽보기에 더 편하답니다.
-    dominating_topic: |
-      ### 다른 사람들이 대화에 참여하게 하십시오
-
-      이 글은 사용자님에게 중요합니다 &ndash; 사용자님은 여기에 %{percent}% 이상의 댓글을 게시했습니다.
-
-      다른 사람들에게도 그들의 관점을 공유 할 수있는 공간을 제공하면 더 좋을 수 있습니다. 그들을 초대 할 수 있습니까?
     get_a_room: |
       ### 모든 사람이 대화에 참여하도록 장려
 
@@ -1417,7 +1411,6 @@ ko:
     detailed_404: "특정 주제에 액세스 할 수없는 이유에 대한 자세한 정보를 사용자에게 제공합니다. 참고 : URL이 유효한 주제로 연결되는지 사용자가 알기 때문에 보안 수준이 떨어집니다."
     enforce_second_factor: "사용자가 2단계 인증을 사용하도록합니다. 모든 사용자에게 적용하려면 '모두'를 선택하십시오. 관리자에게만 적용하려면 '관리자'를 선택하십시오."
     force_https: "사이트가 HTTPS를 사용하도록 강제합니다. 경고: HTTPS가 완벽히 적용되어 있는 것을 확인하기 전까지는 이 옵션을 켜지마세요. CDN, 소셜 로그인, 외부 링크로 가져오는 자료, 로고들이 HTTPS호환성이 있는지 확인하셨나요?"
-    same_site_cookies: "동일한 사이트 쿠키를 사용하면 지원되는 브라우저 (Lax 또는 Strict)에서 모든 벡터 교차 사이트 요청 위조를 제거합니다. 경고 : Strict는 로그인을 강제하고 외부 인증 방법을 사용하는 사이트에서만 작동합니다."
     summary_score_threshold: "요약본에 포함되기 위한 글의 최소 점수 값"
     summary_posts_required: "&#39;이 주제 요약&#39;이 활성화되기 전에 주제의 최소 게시물. 이 설정에 대한 변경 사항은 일주일 이내에 소급 적용됩니다."
     summary_likes_required: "&#39;이 주제 요약&#39;이 활성화되기 전에 주제에서 최소 좋아요를 찾습니다. 이 설정에 대한 변경 사항은 일주일 이내에 소급 적용됩니다."
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index a5171509bf..77b76e3b96 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -427,12 +427,6 @@ nl:
       U kunt uw eerdere antwoord bewerken om een citaat toe te voegen door tekst te accentueren en de knop <b>Bericht citeren</b> die verschijnt te selecteren.
 
       Het is voor iedereen makkelijker om topics te lezen die minder uitgebreide antwoorden bevatten dan die met veel kleine, individuele antwoorden.
-    dominating_topic: |
-      ### Laat anderen aan de conversatie deelnemen
-
-      Dit topic is duidelijk belangrijk voor u &ndash; u hebt hier meer dan %{percent}% van de antwoorden geplaatst.
-
-      Het zou nog beter kunnen zijn als u ook anderen de ruimte geeft om hun ideeën te delen. Kunt u ze uitnodigen?
     too_many_replies: |
       ### U hebt de antwoordlimiet voor dit topic bereikt
 
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index 636d321444..a62d4deb5c 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -532,12 +532,6 @@ pl_PL:
       Możesz edytować swoje wcześniejsze odpowiedzi, aby dodać cytat, poprzez podświetlenie tekstu i wybranie przycisku <b>cytuj odpowiedź</b> który się pojawi.
 
       Każdemu łatwiej będzie przeczytać temat, który ma kilka pogłębionych odpowiedzi, zamiast wielu niewielkich, indywidualnych.
-    dominating_topic: |
-      ### Pozwól innym przyłączyć się do rozmowy
-
-      Ten temat jest dla Ciebie wyraźnie ważny &ndash; opublikowałeś/łaś tutaj ponad %{percent}% odpowiedzi.
-
-      Byłoby jeszcze lepiej, gdybyś dał innym ludziom przestrzeń do podzielenia się swoimi punktami widzenia. Możesz ich zaprosić?
     get_a_room: |
       ### Zachęć wszystkich do zaangażowania się w rozmowę
 
@@ -1572,7 +1566,6 @@ pl_PL:
     detailed_404: "Dostarcza użytkownikom więcej informacji o tym, dlaczego nie mogą uzyskać dostępu do określonego tematu. Uwaga: jest to mniej bezpieczne, ponieważ użytkownicy będą wiedzieć, czy adres URL prowadzi do prawidłowego tematu."
     enforce_second_factor: "Wymusza na użytkownikach włączenie uwierzytelniania dwuskładnikowego. Wybierz opcję 'wszystkie', aby wymusić na wszystkich użytkownikach. Wybierz 'personel', aby wymusić tylko użytkownikach z personelu."
     force_https: "Wymuś używanie wyłącznie HTTPS na stronie. UWAGA: NIE włączaj tego dopóki nie zweryfikujesz, że HTTPS jest w pełni skonfigurowany i działa absolutnie wszędzie! Czy sprawdziłeś/łaś swoje CDN, loginy z portali społecznościowych i wszystkie zewnętrzne loga / zależności żeby być pewnym, że są kompatybilne z HTTPS?"
-    same_site_cookies: "Używaj plików cookie tej samej witryny, eliminując wszystkie wektory Cross Site Request Forgery w obsługiwanych przeglądarkach (Lax lub Strict). Ostrzeżenie: ścisłe będzie działać tylko w witrynach, które wymagają logowania i używają zewnętrznej metody uwierzytelniania."
     summary_score_threshold: "Minimalny wynik wpisu wymagany do umieszczenia go w 'Podsumowaniu tematu'"
     summary_posts_required: "Minimalna liczba wpisów w temacie przed „Podsumowaniem tego tematu” jest włączona. Zmiany tego ustawienia zostaną zastosowane z mocą wsteczną w ciągu tygodnia."
     summary_likes_required: "Minimalna liczba polubień w temacie przed włączeniem „Podsumuj ten temat”. Zmiany tego ustawienia zostaną zastosowane z mocą wsteczną w ciągu tygodnia."
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index 73f63846e5..68b7d0e72b 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -57,7 +57,7 @@ pt_BR:
   themes:
     bad_color_scheme: "Não é possível atualizar o tema, paleta de cores inválida"
     other_error: "Ocorreu um erro ao atualizar o tema"
-    ember_selector_error: "Desculpe, usar #ember or . seletores .ember-view CSS não é permitido, porque esses nomes são gerados dinamicamente durante a execução e mudarão ao longo do tempo, podendo resultar em um CSS quebrado. Tente um seletor diferente."
+    ember_selector_error: "Desculpe, usar #ember ou . seletores .ember-view CSS não é permitido, porque esses nomes são gerados dinamicamente durante a execução e mudarão ao longo do tempo, podendo resultar em um CSS quebrado. Tente um seletor diferente."
     compile_error:
       unrecognized_extension: "Extensão de arquivo não reconhecida: %{extension}"
     import_error:
@@ -263,7 +263,7 @@ pt_BR:
   invalid_params: "Você forneceu parâmetros inválidos para o pedido %{message}"
   not_logged_in: "Você precisa entrar com sua conta para fazer isto."
   not_found: "A URL ou recurso pedido não pôde ser encontrada."
-  invalid_access: "Você não tem permissão para visualizar o recurso pedido."
+  invalid_access: "Você não tem permissão para ver o recurso solicitado."
   authenticator_not_found: "O método de autenticação não existe ou foi desativado."
   invalid_api_credentials: "Você não tem permissão para visualizar o recurso pedido. O nome do(a) usuário(a) ou a chave da API é inválida."
   provider_not_enabled: "Você não tem permissão para visualizar o recurso pedido. O provedor de autenticação não está ativado."
@@ -320,7 +320,7 @@ pt_BR:
   too_many_mentions_newuser:
     one: "Desculpe, usuários(as) novos(as) podem mencionar apenas um(a) usuário(as) em uma postagem."
     other: "Desculpe, usuários(as) novos(as) podem mencionar apenas %{count} usuários(as) em uma postagem."
-  no_embedded_media_allowed_trust: "Desculpe, n"
+  no_embedded_media_allowed_trust: "Desculpe, não é possível incorporar itens de mídia nesta postagem."
   no_embedded_media_allowed: "Desculpe, novos(as) usuários(as) não podem incorporar itens de mídia em postagens."
   too_many_embedded_media:
     one: "Desculpe, novos(as) usuários(as) só podem inserir um item de mídia incorporado em uma postagem."
@@ -481,12 +481,7 @@ pt_BR:
       Você pode editar sua resposta anterior para adicionar uma citação selecionando um texto e clicando no botão <b>responder citação</b> que aparecerá.
 
       Fica mais fácil para todos(as) lerem tópicos com poucas respostas e muitas informações em vez de muitas respostas individuais e curtas.
-    dominating_topic: |
-      ### Permita que outras pessoas participem da conversa
-
-      Este tópico é muito importante para você &ndash; você postou mais de %{percent}% das respostas aqui.
-
-      Seria ainda melhor se você desse espaço para que outras pessoas compartilhassem seus pontos de vista também. Poderia convidá-las?
+    dominating_topic: Você postou mais do que %{percent} das respostas aqui, deseja saber a opinião de outra pessoa?
     get_a_room: |
       ### Incentive todos a se envolverem na conversa
 
@@ -1010,7 +1005,7 @@ pt_BR:
     otp_confirmation:
       confirm_title: Continuar no %{site_name}
       logging_in_as: Entrando como %{username}
-      confirm_button: Terminar de entrar com a conta
+      confirm_button: Terminar de entrar
     no_trust_level: "Desculpe, você não tem o nível de confiança necessário para acessar a API de usuário(a)."
     generic_error: "Desculpe, não foi possível emitir as chaves de API de usuário(a). Esse recurso pode ter sido desativado pelo(a) administrador(a) do site."
     scopes:
@@ -1740,8 +1735,8 @@ pt_BR:
     min_trust_to_flag_posts: "O nível de confiança mínimo necessário para sinalizar postagens"
     min_trust_to_post_links: "O nível de confiança mínimo necessário para incluir links em postagens"
     min_trust_to_post_embedded_media: "O nível de confiança mínimo necessário para incorporar itens de mídia em uma postagem"
-    min_trust_level_to_allow_profile_background: "O nível de confiança mínimo necessário par a enviar um plano de fundo para perfil"
-    min_trust_level_to_allow_user_card_background: "O nível de confiança mínimo necessário par a enviar um plano de fundo para cartão de usuário(a)"
+    min_trust_level_to_allow_profile_background: "O nível de confiança mínimo necessário para enviar um plano de fundo para perfil"
+    min_trust_level_to_allow_user_card_background: "O nível de confiança mínimo necessário para enviar um plano de fundo para cartão de usuário(a)"
     min_trust_level_to_allow_invite: "O nível de confiança mínimo necessário para convidar usuários(as)"
     min_trust_level_to_allow_ignore: "O nível de confiança mínimo necessário para ignorar usuários(as)"
     allowed_link_domains: "Domínios aos quais os(as) usuários(as) podem vincular, mesmo que não tenham o nível de confiança apropriado para postar links"
@@ -2256,6 +2251,7 @@ pt_BR:
     reset_not_allowed_from_ip_address: "Não é possível solicitar uma redefinição de senha a partir deste endereço IP."
     suspended: "Você não pode entrar até %{date}."
     suspended_with_reason: "Conta suspensa até %{date}: %{reason}"
+    suspended_with_reason_forever: "Conta suspensa: %{reason}"
     errors: "%{errors}"
     not_available: "Não disponível. Tentar %{suggestion}?"
     something_already_taken: "Algo deu errado, talvez o nome do(a) usuário(a) ou o e-mail já tenham sido cadastrados. Tente o link Esqueci minha senha."
@@ -2509,9 +2505,35 @@ pt_BR:
   new_version_mailer:
     title: "Nova versão do mensageiro"
     subject_template: "[%{email_prefix}] Nova versão do Discourse, atualização disponível"
+    text_body_template: |
+      Viva! Uma nova versão do [Discourse](https://www.discourse.org) está disponível!
+
+      Seu versão: %{installed_version}
+      Nova versão: **%{new_version}**
+
+      - Atualize com facilidade usando a nossa **[atualização no navegador em um clique](%{base_url}/admin/upgrade)**
+
+      - Confira as novidades nas [notas da versão](https://meta.discourse.org/tag/release-notes) ou veja o [registro de alterações não processados GitHub](https://github.com/discourse/discourse/commits/main)
+
+      - Acesse [meta.discourse.org](https://meta.discourse.org) para obter novidades, discussões e suporte para o Discourse
   new_version_mailer_with_notes:
     title: "Nova versão do mensageiro com notas"
     subject_template: "[%{email_prefix}] atualização disponível"
+    text_body_template: |
+      Viva! Uma nova versão do [Discourse](https://www.discourse.org) está disponível!
+
+      Seu versão: %{installed_version}
+      Nova versão: **%{new_version}**
+
+      - Atualize com facilidade usando a nossa **[atualização no navegador em um clique](%{base_url}/admin/upgrade)**
+
+      - Confira as novidades nas [notas da versão](https://meta.discourse.org/tag/release-notes) ou veja o [registro de alterações não processados GitHub](https://github.com/discourse/discourse/commits/main)
+
+      - Acesse [meta.discourse.org](https://meta.discourse.org) para obter novidades, discussões e suporte para o Discourse
+
+      ### Notas da versão
+
+      %{notes}
   flag_reasons:
     off_topic: "Sua postagem foi sinalizada como **desvio de tópico**. A comunidade acha que não é compatível com o tópico conforme definida no título e na primeira postagem."
     inappropriate: "Sua postagem foi sinalizada como **não apropriada**: A comunidade acha que é ofensiva, abusiva, ou uma violação das [nossas diretrizes da comunidade](%{base_path}/guidelines)."
@@ -3088,6 +3110,7 @@ pt_BR:
   subject_re: "Re:"
   subject_pm: "[PM]"
   email_from: "%{user_name} via %{site_name}"
+  email_from_without_site: "%{user_name}"
   user_notifications:
     previous_discussion: "Respostas anteriores"
     reached_limit:
@@ -3301,11 +3324,18 @@ pt_BR:
 
         %{message}
     account_suspended:
-      title: "Conta suspença"
+      title: "Conta suspensa"
       subject_template: "[%{email_prefix}] A sua conta foi suspensa"
       text_body_template: |
         Você foi suspenso(a) do fórum até %{suspended_till}.
 
+        Motivo: %{reason}
+    account_suspended_forever:
+      title: "Conta suspensa"
+      subject_template: "%{email_prefix}, sua conta foi suspensa"
+      text_body_template: |
+        Sua conta foi suspensa do fórum.
+
         Motivo: %{reason}
     account_silenced:
       title: "Conta silenciada"
@@ -3313,6 +3343,13 @@ pt_BR:
       text_body_template: |
         Você foi silenciado(a) do fórum até %{silenced_till}.
 
+        Motivo: %{reason}
+    account_silenced_forever:
+      title: "Conta silenciada"
+      subject_template: "%{email_prefix}, sua conta foi silenciada"
+      text_body_template: |
+        Sua conta foi silenciada do fórum.
+
         Motivo: %{reason}
     account_exists:
       title: "esta conta já existe"
@@ -4265,7 +4302,7 @@ pt_BR:
       title: "Confirme seu e-mail"
       message: "<p>Enviamos um e-mail de ativação para <b>%{email}</b>. Por favor, siga as instruções no e-mail para ativar sua conta.</p><p>Se não chegar, verifique sua pasta de spam e <a href='https://meta.discourse.org/t/troubleshooting-email-on-a-new-discourse-install/16326'>se o e-mail foi configurado corretamente</a>.</p>"
     resend_email:
-      title: "Reenviar e-mail de confirmação"
+      title: "Enviar novamente e-mail de ativação"
       message: "<p>Reenviamos o e-mail de confirmação para <b>%{email}</b>"
   safe_mode:
     title: "Entrar no modo de segurança"
@@ -4418,7 +4455,7 @@ pt_BR:
   discourse_push_notifications:
     popup:
       mentioned: 'Você foi mencionado(a) por %{username} em "%{topic}" - %{site_title}'
-      group_mentioned: 'Você foi mencionado(a) %{username} em "%{topic}" - %{site_title}'
+      group_mentioned: 'Você foi mencionado(a) por %{username} em "%{topic}" - %{site_title}'
       quoted: 'Você foi citado(a) por %{username} em "%{topic}" - %{site_title}'
       replied: '%{username} respondeu em "%{topic}" - %{site_title}'
       posted: '%{username} postou em "%{topic}" - %{site_title}'
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index 9a40f1eb34..9a8edecada 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -532,12 +532,7 @@ ru:
       Вместо нового ответа, можно начать редактировать свой предыдущий ответ и просто добавить в него новые цитаты и ответы на них. Для этого нужно выделить требуемый текст и нажать на появившуюся кнопку <b>Ответить с цитированием</b>.
 
       Для большинства людей намного проще читать темы, содержащие несколько ответов в одном сообщении, чем много отдельных коротких ответов.
-    dominating_topic: |
-      ### Позвольте другим присоединиться к беседе.
-
-       Эта тема явно важна для вас - вы опубликовали здесь более %{percent}% ответов.
-
-      Было бы ещё лучше, если бы вы дали другим людям возможность поделиться своей точкой зрения. Можете ли вы пригласить их для участия в этой теме?
+    dominating_topic: Вы опубликовали здесь более %{percent}% ответов, возможно, стоит услышать ещё чьё-то мнение?
     get_a_room: |
       ### Призовите всех потенциальных участников принять участие в разговоре
 
@@ -1572,7 +1567,6 @@ ru:
     detailed_404: "Предоставление пользователям более подробной информации о том, почему они не могут получить доступ к определённой теме. Примечание: Это менее безопасно, поскольку пользователи будут знать, ссылается ли URL-адрес на допустимую тему."
     enforce_second_factor: "Принудительное включение двухфакторной аутентификации. Выберите 'all', чтобы применить его ко всем пользователям. Выберите 'staff', чтобы принудительно использовать её только сотрудниками."
     force_https: "Принудительное использование протокола HTTPS. ВНИМАНИЕ: НЕ включайте этот параметр, пока не убедитесь, что HTTPS полностью настроен и работает абсолютно везде! Вы проверили настройки сети, доступность учётных записей в социальных сетях, доступность внешних логотипов и зависимостей, чтобы убедиться, что они корректно работают при использовании HTTPS?"
-    same_site_cookies: "Использовать одни и те же файлы cookie, они предотвращают <a href='https://ru.wikipedia.org/wiki/Межсайтовая_подделка_запроса' target='_blank'>межсайтовую подделку запроса</a> в поддерживаемых браузерах (Lax или Strict). Предупреждение: Strict будет работать только на сайтах, которые поддерживают принудительный вход в систему и используют внешнюю аутентификацию."
     summary_score_threshold: "Минимальная оценка сообщения, необходимая для его включения в сводку по теме"
     summary_posts_required: "Минимальное количество сообщений, необходимое для получения сводки по теме. Изменения этого параметра будут применены к темам за прошедшую неделю."
     summary_likes_required: "Минимальное количество симпатий, необходимое для получения сводки по теме. Изменения этого параметра будут применены к темам за прошедшую неделю."
@@ -2399,6 +2393,7 @@ ru:
     reset_not_allowed_from_ip_address: "Запрос на сброс пароля с этого IP-адреса запрещён."
     suspended: "Вы не можете войти до %{date}."
     suspended_with_reason: "Учётная запись заморожена до %{date}: %{reason}"
+    suspended_with_reason_forever: "Учётная запись заморожена: %{reason}"
     errors: "%{errors}"
     not_available: "Недоступно. Попробуйте %{suggestion}?"
     something_already_taken: "Что-то пошло не так, возможно, имя пользователя или электронный ящик уже используются. Попробуйте восстановить ваш пароль."
@@ -3495,6 +3490,10 @@ ru:
     account_suspended_forever:
       title: "Учётная запись заморожена"
       subject_template: "[%{email_prefix}] Ваш аккаунт был заморожен"
+      text_body_template: |
+        Вы были отстранены от форума.
+
+        Причина: %{reason}
     account_silenced:
       title: "Учётная запись заблокирована"
       subject_template: "[%{email_prefix}] Ваш аккаунт был заблокирован"
@@ -3505,6 +3504,10 @@ ru:
     account_silenced_forever:
       title: "Учётная запись заблокирована"
       subject_template: "[%{email_prefix}] Ваш аккаунт был заблокирован"
+      text_body_template: |
+        Вы были заблокированы на форуме.
+
+        Причина: %{reason}
     account_exists:
       title: "Учётная запись уже существует"
       subject_template: "[%{email_prefix}] Учётная запись уже существует"
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index 7b00dc542d..400c236ecc 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -481,12 +481,7 @@ sv:
       Du kan redigera ditt tidigare svar och lägga till ett citat genom att markera text och välja knappen <b>citera</b> som dyker upp.
 
       Det blir lättare för alla att läsa ämnen som har färre in-på-djupet-svar istället för flera små, individuella svar.
-    dominating_topic: |
-      ### Låt andra vara med i samtalet
-
-      Detta ämne är uppenbarligen viktigt för dig &ndash; du har postat mer än %{percent}% av alla svar här.
-
-      Det vore ännu bättre om du gav andra personer utrymme att dela med sig av sina synpunkter också. Kanske kan du bjuda in dem?
+    dominating_topic: Du har publicerat mer än %{percent} % av svaren här. Finns det någon annan du vill höra från?
     get_a_room: |
       ### Uppmuntra alla att delta i samtalet
 
@@ -2477,9 +2472,25 @@ sv:
   new_version_mailer:
     title: "E-post om ny version"
     subject_template: "[%{email_prefix}] Ny version av Discourse, uppdatering tillgänglig"
+    text_body_template: "Hurra, det finns en ny version av [Discourse](http://www.discourse.org) tillgänglig!\n\nDin version: %{installed_version}\nNy version: **%{new_version}**\n\n- Uppgradera genom att använda den enkla **[uppgraderingsknappen](%{base_url}/admin/upgrade)** \n\n- Se vad som är nytt i [uppdateringsnoteringarna](https://meta.discourse.org/tag/release-notes) eller läs i [GitHubs råa ändringslogg](https://github.com/discourse/discourse/commits/main)\n\n- Besök [meta.discourse.org](http://meta.discourse.org) för att läsa de senaste nyheterna, diskutera eller få hjälp angående Discourse\n"
   new_version_mailer_with_notes:
     title: "E-post om ny version med anteckningar"
     subject_template: "[%{email_prefix}] Uppdatering tillgänglig"
+    text_body_template: |
+      Hurra, det finns en ny version av [Discourse](http://www.discourse.org) tillgänglig!
+
+      Din version: %{installed_version}
+      Ny version: **%{new_version}**
+
+      - Uppgradera genom att använda den enkla **[uppgraderingsknappen](%{base_url}/admin/upgrade)**
+
+      - Se vad som är nytt i [uppdateringsnoteringarna](https://meta.discourse.org/tag/release-notes) eller läs i [GitHubs råa ändringslogg](https://github.com/discourse/discourse/commits/main)
+
+      - Besök [meta.discourse.org](http://meta.discourse.org) för att läsa de senaste nyheterna, diskutera eller få hjälp angående Discourse
+
+      ### Uppdateringsnoteringar
+
+      %{notes}
   flag_reasons:
     off_topic: "Ditt inlägg blev flaggat som **irrelevant**. Medlemmarna i forumet kände att det inte är passande för ämnet, som definieras av rubriken och det första inlägget."
     inappropriate: "Ditt inlägg blev flaggat som **olämpligt**. Medlemmarna i forumet kände att det är störande, kränkande eller att det strider mot [våra riktlinjer](%{base_path}/guidelines)."
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index 6b907b9d5b..c536e4f1c5 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -474,7 +474,6 @@ tr_TR:
 
       Herkesin benzersiz bir profil resmi olduğunda, tartışmaları takip etmek ve konuşmalarda ilginç insanlar bulmak daha kolay!
     sequential_replies: "### Aynı anda birkaç gönderiye yanıt vermeyi denediniz \nBunun yerine yerine, lütfen önceki gönderilerden alıntılar veya @name referansları içeren tek bir yanıt veriniz.\nMetni vurgulayıp görünen <b>alıntı</b> düğmesini seçerek önceki yanıtınızı düzenleyebilirsiniz. Böylece diğer kullanıcıların, yanıtlarınızı okuması daha kolay olacaktır.\n"
-    dominating_topic: "### Diğer insanları da tartışmaya dahil et \n\nBelli ki bu konu sizin için çok önemli &ndash; çünkü buradaki yanıtların %{percent} yüzdesinden çoğunu siz göndermişsiniz.\n\nDiğer insanlara da kendi bakış açılarını paylaşmaları için alan verirseniz daha da iyi olabilir. Onları da davet etmek istemez misin?\n"
     get_a_room: |
       ### Herkesi sohbete katılmaya teşvik edin
 
diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml
index d209a4134e..0a1afaee38 100644
--- a/config/locales/server.uk.yml
+++ b/config/locales/server.uk.yml
@@ -512,12 +512,6 @@ uk:
       Замість нового відповіді, зараз можна почати редагувати свій попередній відповідь і просто додати в нього нові цитати і відповіді та них. Для цього потрібно виділити необхідний текст і натиснути на кнопку, що з'явилася <b>відповісти цитуванням</b>.
 
       Для більшості людей набагато простіше читати теми, у яких довгі відповіді і їх мало, ніж коли багато коротеньких відповідей.
-    dominating_topic: |
-      ### Дозвольте іншим приєднатися до розмови
-
-      Ця тема вам очевидно важлива &ndash; Ви тут розмістили більше %{percent}% відповідей.
-
-      Це може бути ще краще, якби ви дали можливість іншим людям поділитися своїми точками зору. Чи можете ви запросити їх?
     get_a_room: |
       ### Покличте всіх взяти участь в розмові
 
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index de6ef9e505..1b3dba325f 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -200,7 +200,7 @@ zh_CN:
       cors_origins_should_not_have_trailing_slash: "您不应该将尾部反斜杠 (/) 添加到 CORS 源。"
     conflicting_google_user_id: '此帐户的 Google 帐号 ID 已更改；出于安全原因，需要管理人员干预。请联系管理人员并将他们指向 <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
     onebox:
-      invalid_address: "抱歉，我们无法为此网页生成预览，因为找不到服务器 '%{hostname}'。您的帖子中只会显示链接，而不会显示预览。 :cry:"
+      invalid_address: "抱歉，我们无法为此网页生成预览，因为找不到服务器 '%{hostname}'。您的帖子中只会显示链接，而不会显示预览。:cry:"
       error_response: "抱歉，我们无法为此网页生成预览，因为服务器返回错误代码 %{status_code}。您的帖子中只会显示链接，而不会显示预览。:cry:"
       missing_data:
         other: "抱歉，我们无法为此网页生成预览，因为找不到以下 oEmbed / OpenGraph 标签：%{missing_attributes}"
@@ -456,12 +456,6 @@ zh_CN:
       您可以突出显示文本并选择出现的<b>引用回复</b>按钮，对您之前的回复进行编辑以添加引用。
 
       这样，每个人都可以更轻松地阅读具有少量嵌套回复的话题，而不是查看大量的个别回复。
-    dominating_topic: |
-      ### 让其他人也加入讨论
-
-      此话题显然对您很重要 - 在所有回复中您的发言占比超过 %{percent}%。
-
-      留一点空间给其他人分享他们自己的见解会更好。您能邀请他们吗？
     get_a_room: |
       ### 鼓励每一个人都参与到讨论中
 
@@ -766,7 +760,7 @@ zh_CN:
     please_continue: "继续访问 %{site_name}"
     error: "更改您的电子邮件地址时出错。也许该地址已被使用？"
     doesnt_exist: "该电子邮件地址未与您的帐户关联。"
-    error_staged: "更改您的电子邮件地址时出错。该地址已被用户使用。"
+    error_staged: "更改您的电子邮件地址时出错。该地址已被暂存用户使用。"
     already_done: "抱歉，此确认链接不再有效。也许您的电子邮件已被更改？"
     confirm: "确认"
     max_secondary_emails_error: "您已达到允许的最大辅助电子邮件数量。"
@@ -816,7 +810,7 @@ zh_CN:
       email_body: "%{link}\n\n%{message}"
     inappropriate:
       title: "不当言论"
-      description: '此帖子包含对他人攻击、辱骂的言论或违反了<a href="%{base_path}/guidelines">我们的社区准则</a>。'
+      description: '此帖子包含对他人攻击、辱骂的内容或违反了<a href="%{base_path}/guidelines">我们的社区准则</a>。'
       short_description: '违反了<a href="%{base_path}/guidelines">我们的社区准则</a>'
     notify_user:
       title: "向 @%{username} 发送消息"
@@ -828,7 +822,7 @@ zh_CN:
       title: "其他内容"
       description: "由于上面未列出的另一个原因，此帖子需要管理人员注意。"
       short_description: "因其他原因需要管理人员注意"
-      email_title: '“%{title}”中的一个帖子需要工作人员注意'
+      email_title: '“%{title}”中的一个帖子需要管理人员注意'
       email_body: "%{link}\n\n%{message}"
     bookmark:
       title: "加入书签"
@@ -879,7 +873,7 @@ zh_CN:
       challenge_mismatch_error: "提供的质询与身份验证服务器生成的质询不匹配。"
       invalid_origin_error: "身份验证请求的来源与服务器来源不匹配。"
       malformed_attestation_error: "解码证明数据时出错。"
-      invalid_relying_party_id_error: "身份验证请求的依赖方 ID 与服务器依赖方 ID 不匹配。"
+      invalid_relying_party_id_error: "身份验证请求的信赖方 ID 与服务器信赖方 ID 不匹配。"
       user_verification_error: "需要用户验证。"
       unsupported_public_key_algorithm_error: "服务器不支持提供的公钥算法。"
       unsupported_attestation_format_error: "服务器不支持该证明格式。"
@@ -896,7 +890,7 @@ zh_CN:
       short_description: "这是广告"
     inappropriate:
       title: "不当言论"
-      description: '此话题包含对他人攻击、辱骂的言论或违反了<a href="%{base_path}/guidelines">我们的社区准则</a>。'
+      description: '此话题包含对他人攻击、辱骂的内容或违反了<a href="%{base_path}/guidelines">我们的社区准则</a>。'
       long_form: "将此话题举报为不当言论"
       short_description: '违反了<a href="%{base_path}/guidelines">我们的社区准则</a>'
     notify_moderators:
@@ -1415,7 +1409,6 @@ zh_CN:
     detailed_404: "向用户提供有关他们无法访问特定话题的更多详细信息。注意：这不太安全，因为用户会知道 URL 是否链接到有效话题。"
     enforce_second_factor: "强制用户启用双重身份验证。选择“所有”可以强制所有用户。选择“管理人员”仅强制管理人员。"
     force_https: "强制您的站点仅使用 HTTPS。警告：在您验证 HTTPS 已完全设置并在任何地方都可以正常工作之前，请勿启用此功能！您是否检查过您的 CDN、所有社交登录以及任何外部徽标/依赖项，以确保它们都与 HTTPS 兼容？"
-    same_site_cookies: "使用相同的站点 Cookie，它们在支持的浏览器上消除了所有向量跨站点请求伪造（宽松或严格）。警告：“严格”仅适用于强制登录并使用外部身份验证方法的站点。"
     summary_score_threshold: "将帖子包含在“总结此话题”中所需的最低分数"
     summary_posts_required: "启用“总结此话题”之前话题中的最少帖子数。对此设置的更改将在一周内追溯应用。"
     summary_likes_required: "启用“总结此话题”之前话题中的最少赞数。对此设置的更改将在一周内追溯应用。"
@@ -1516,13 +1509,13 @@ zh_CN:
     auto_approve_email_domains: "使用此网域列表中电子邮件地址的用户将自动获得批准。"
     hide_email_address_taken: "在注册期间和在“忘记密码”表单中不通知用户存在使用给定电子邮件地址的帐户。"
     log_out_strict: "退出时，退出用户在所有设备上的会话"
-    version_checks: "Ping Discourse Hub 以获取版本更新并在 <a href='%{base_path}/admin' target='_blank'>/admin</a> 仪表板上显示新版本消息"
+    version_checks: "Ping Discourse Hub 以获取版本更新并在 <a href='%{base_path}/admin' target='_blank'>/admin</a> 信息中心上显示新版本消息"
     new_version_emails: "当有新版本的 Discourse 时，向 contact_email 地址发送一封电子邮件。"
     invite_expiry_days: "用户邀请密钥的有效期，以天为单位"
     invite_only: "所有新用户必须由受信任的用户或管理人员明确邀请。公共注册被禁用。"
     login_required: "需要进行身份验证才能阅读此站点上的内容，禁止匿名访问。"
-    min_username_length: "最小用户名长度。警告：如果任何现有用户或群组名称的长度比此数值短，您的站点将无法正常工作！"
-    max_username_length: "最大用户名长度。警告：如果任何现有用户或群组名称的长度比此数值长，您的站点将无法正常工作！"
+    min_username_length: "最小用户名长度（以字符为单位）。警告：如果任何现有用户或群组名称的长度比此数值短，您的站点将无法正常工作！"
+    max_username_length: "最大用户名长度（以字符为单位）。警告：如果任何现有用户或群组名称的长度比此数值长，您的站点将无法正常工作！"
     unicode_usernames: "允许用户名和群组名称包含 Unicode 字母和数字。"
     allowed_unicode_username_characters: "仅在用户名中允许某些 Unicode 字符的正则表达式。ASCII 字符和数字将始终被允许，不需要包含在许可名单中。"
     reserved_usernames: "不允许注册的用户名。通配符 * 可用于匹配任何字符零次或多次。"
@@ -1794,7 +1787,7 @@ zh_CN:
     bounce_score_threshold: "在我们停止向用户发送电子邮件之前的最大退回分数。"
     reset_bounce_score_after_days: "X 天后自动重置退回分数。"
     blocked_attachment_content_types: "用于根据内容类型屏蔽附件的关键字列表。"
-    blocked_attachment_filenames: "用于根据文件名屏蔽附件的关键字列表。"
+    blocked_attachment_filenames: "用于根据文件名屏蔽名单附件的关键字列表。"
     forwarded_emails_behaviour: "如何处理转发到 Discourse 的电子邮件"
     always_show_trimmed_content: "始终显示传入电子邮件被修剪的部分。警告：可能会泄露电子邮件地址。"
     trim_incoming_emails: "修剪传入电子邮件的不相关部分。"
@@ -1845,7 +1838,7 @@ zh_CN:
     digest_posts: "要在电子邮件摘要中显示的热门帖子的最大数量。"
     digest_other_topics: "在电子邮件摘要的“您关注的新话题和类别”部分中显示的最大话题数。"
     digest_min_excerpt_length: "电子邮件摘要中的最少帖子摘录，以字符为单位。"
-    suppress_digest_email_after_days: "禁止向超过 (n) 天未在网站上看到的用户发送摘要电子邮件。"
+    suppress_digest_email_after_days: "禁止向超过 (n) 天未在站点上看到的用户发送摘要电子邮件。"
     digest_suppress_categories: "从摘要电子邮件中禁止这些类别。"
     disable_digest_emails: "禁用所有用户的摘要电子邮件。"
     apply_custom_styles_to_digest: "自定义电子邮件模板和 CSS 应用于摘要电子邮件。"
@@ -1886,7 +1879,7 @@ zh_CN:
     header_dropdown_category_count: "标题下拉菜单中可以显示的类别数量。"
     permalink_normalizations: "在匹配永久链接之前应用以下正则表达式，例如：/(topic.*)\\?.*/\\1 将从话题路由中去除查询字符串。格式为正则表达式+字符串。使用 \\1 等访问捕获"
     global_notice: "向所有访客显示紧急、突发、不可关闭的全局横幅通知，更改为空将隐藏（允许使用 HTML）。"
-    disable_system_edit_notifications: "当 'download_remote_images_to_local' 启用时禁用系统用户的编辑提醒。"
+    disable_system_edit_notifications: "当 'download_remote_images_to_local' 启用时禁用系统用户的编辑通知。"
     notification_consolidation_threshold: "合并通知前，收到的赞或成员资格请求通知的数量。设置为 0 将禁用。"
     likes_notification_consolidation_window_mins: "以分钟计的持续时间，被赞的通知在达到此阈值后会被合并到单个通知中。可以通过 `SiteSetting.notification_consolidation_threshold` 配置阈值。"
     automatically_unpin_topics: "当用户到达底部时自动取消置顶话题。"
@@ -2018,8 +2011,8 @@ zh_CN:
     shared_drafts_min_trust_level: "允许用户查看和编辑共享草稿。"
     push_notifications_prompt: "显示用户同意提示。"
     push_notifications_icon: "出现在通知角的徽章图标。建议使用具有透明度的 96×96 单色 PNG。"
-    base_font: "用于网站上大多数文本的基字体。可以通过 `--font-family` CSS 自定义属性替换主题。"
-    heading_font: "用于网站标题的字体。可以通过 `--heading-font-family` CSS 自定义属性替换主题。"
+    base_font: "用于站点上大多数文本的基字体。可以通过 `--font-family` CSS 自定义属性替换主题。"
+    heading_font: "用于站点上标题的字体。可以通过 `--heading-font-family` CSS 自定义属性替换主题。"
     short_title: "短标题将用于用户的主屏幕、启动器或其他空间可能有限的地方。应被限制为 12 个字符。"
     dashboard_hidden_reports: "允许从信息中心隐藏指定报告。"
     dashboard_visible_tabs: "选择可见的信息中心标签页。"
@@ -2051,7 +2044,7 @@ zh_CN:
       pop3_polling_host_is_empty: "在启用 POP3 轮询前，您必须先设置 'pop3 polling host'。"
       pop3_polling_username_is_empty: "在启用 POP3 轮询前，您必须先设置 'pop3 polling username'。"
       pop3_polling_password_is_empty: "在启用 POP3 轮询前，您必须先设置 'pop3 polling password'。"
-      pop3_polling_authentication_failed: "POP3 验证失败。请验证您的 pop3 凭据。"
+      pop3_polling_authentication_failed: "POP3 身份验证失败。请验证您的 pop3 凭据。"
       reply_by_email_address_is_empty: "在启用通过电子邮件回复之前，您必须先设置 'reply by email address'。"
       email_polling_disabled: "在启用通过电子邮件回复之前，您必须先启用手动或者 POP3 轮询。"
       user_locale_not_enabled: "在启用此设置之前，您必须先启用 'allow user locale'。"
@@ -2169,7 +2162,7 @@ zh_CN:
     security_key_description: "当您准备好物理安全密钥后，请按下面的“使用安全密钥进行身份验证”按钮。"
     security_key_alternative: "尝试另一种方式"
     security_key_authenticate: "使用安全密钥进行身份验证"
-    security_key_not_allowed_error: "安全密钥身份验证超时或被取消。"
+    security_key_not_allowed_error: "安全密钥身份验证过程超时或被取消。"
     security_key_no_matching_credential_error: "在提供的安全密钥中找不到匹配的凭据。"
     security_key_support_missing_error: "您当前的设备或浏览器不支持使用安全密钥。请使用其他方法。"
     security_key_invalid: "验证安全密钥时出错。"
@@ -3043,7 +3036,7 @@ zh_CN:
   user_notifications:
     previous_discussion: "以前的回复"
     reached_limit:
-      other: "注意：我们每天最多发送 %{count} 封电子邮件。检查站点以查看可能被阻止的电子邮件。 PS：您很受欢迎！"
+      other: "注意：我们每天最多发送 %{count} 封电子邮件。检查站点以查看可能被阻止的电子邮件。PS：您很受欢迎！"
     in_reply_to: "回复给"
     unsubscribe:
       title: "退订"
@@ -3628,7 +3621,7 @@ zh_CN:
 
       当您看到不良行为时，不要回复。这种承认会变相鼓励这种不良行为，既消耗您的精力，又浪费每一个人的时间。_只需举报它_。如果收到足够多的举报，将会有相应的处理，这种处理可能会自动发生，也可能由版主介入。
 
-      为了维护我们的社区，版主保留随时以任何理由删除任何内容和任何用户帐户的权利。版主不会预先审核任何新帖子；版主和站点维护人员对社区发表的任何言论均不负责任。
+      为了维护我们的社区，版主保留随时以任何理由移除任何内容和任何用户帐户的权利。版主不会预先审核任何新帖子；版主和站点维护人员对社区发表的任何言论均不负责任。
 
       <a name="be-civil"></a>
 
@@ -3983,7 +3976,7 @@ zh_CN:
         当您填写<a href="%{base_uri}/my/preferences/profile">用户个人资料</a>并设置了个人资料照片时，将授予此徽章。让社区更多地了解您是谁以及您对什么感兴趣，这有助于建立一个更好、联系更紧密的社区。加入我们！
     anniversary:
       name: 周年纪念日
-      description: 已成为有效用户一年，并且至少发帖一次
+      description: 已成为活跃成员一年，并且至少发帖一次
       long_description: |
         当您成为成员一年并在此期间至少发布一个帖子时，将授予此徽章。感谢您坚持并为我们的社区做出贡献。没有您，我们做不到。
     nice_post:
@@ -4170,17 +4163,17 @@ zh_CN:
       name: 爱好者
       description: 连续 10 天访问
       long_description: |
-        连续 10 天访问论坛会被授予此勋章。感谢与我们共度超过一周的时光！
+        连续 10 天访问论坛会被授予此徽章。感谢与我们共度超过一周的时光！
     aficionado:
       name: 百尺竿头
       description: 连续 100 天访问
       long_description: |
-        连续 100 天访问论坛会被授予此勋章。这可是超过三个月的时间！
+        连续 100 天访问论坛会被授予此徽章。这可是超过三个月的时间！
     devotee:
       name: 全年不落
       description: 连续 365 天访问
       long_description: |
-        连续 365 天访问论坛会被授予此勋章。哇哦，一整年！
+        连续 365 天访问论坛会被授予此徽章。哇哦，一整年！
     badge_title_metadata: "%{site_title}上的%{display_name}徽章"
   admin_login:
     success: "电子邮件已发送"
diff --git a/plugins/discourse-local-dates/config/locales/client.ja.yml b/plugins/discourse-local-dates/config/locales/client.ja.yml
index bd9cbd54cc..5148f5b510 100644
--- a/plugins/discourse-local-dates/config/locales/client.ja.yml
+++ b/plugins/discourse-local-dates/config/locales/client.ja.yml
@@ -38,5 +38,5 @@ ja:
             every_month: "毎月"
             every_two_months: "隔月"
             every_three_months: "3 か月ごと"
-            every_six_months: "半年ごと"
+            every_six_months: "6 か月毎"
             every_year: "毎年"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.ja.yml b/plugins/discourse-narrative-bot/config/locales/client.ja.yml
index 5cd6bc81bc..4215ba9a6b 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.ja.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.ja.yml
@@ -9,4 +9,4 @@ ja:
     discourse_narrative_bot:
       welcome_post_type:
         new_user_track: "すべての新規ユーザーに新規ユーザー向けチュートリアルを開始する"
-        welcome_message: "すべての新規ユーザーにクイックスタートガイド付きのウェルカムメッセージを送信する"
+        welcome_message: "すべての新規ユーザーにクイックスタートガイド付きのようこそメッセージを送信する"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ja.yml b/plugins/discourse-narrative-bot/config/locales/server.ja.yml
index f0314e4c26..f83c2d4706 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ja.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ja.yml
@@ -277,7 +277,7 @@ ja:
           ](https://www.youtube.com/watch?v=B_wGI3_sGf8) :dancer:)
       flag:
         instructions: |-
-          ディスカッションを友好的に保ちたいと思っています。そこで、[マナーを維持](%{guidelines_url})するにはあなたの力が必要です。問題に遭遇したら、非公開で作者に知らせるか、[スタッフ](%{about_url})に通報してください。投稿を通報する理由は、無害なトピックの分割から明確なコミュニティ規則の違反までさまざまです。**その他**を選択すると、モデレーターと非公開メッセージでのディスカッションを始められます。さらに詳しく質問できます。
+          ディスカッションを友好的に保ちたいと思っています。そこで、[マナーを維持](%{guidelines_url})するにはあなたの力が必要です。問題に遭遇したら、非公開で作成者に知らせるか、[スタッフ](%{about_url})に通報してください。投稿を通報する理由は、無害なトピックの分割から明確なコミュニティ規則の違反までさまざまです。**その他**を選択すると、モデレーターと非公開メッセージでのディスカッションを始められます。さらに詳しく質問できます。
 
           > :imp: 不愉快なことを書き込みました
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml b/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
index 05551783ac..e3a6b5e1e3 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
@@ -387,7 +387,7 @@ zh_CN:
         reply: |-
           太棒了！我希望你没有将这个话题设为免打扰，因为我有时会有点健谈 :grin:。
 
-          请注意，当你回复话题或阅读话题超过几分钟时，它会被自动设置为“跟踪”通知级别。 你可以在[你的用户偏好设置](%{base_uri}/my/preferences)中更改此设置。
+          请注意，当你回复话题或阅读话题超过几分钟时，它会被自动设置为“跟踪”通知级别。你可以在[你的用户偏好设置](%{base_uri}/my/preferences)中更改此设置。
       poll:
         instructions: |-
           你知道你可以在任何帖子中添加投票吗？尝试使用编辑器中的 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> 齿轮图标来**构建投票**。
@@ -420,7 +420,7 @@ zh_CN:
           [details=点这里查看运作方式！]
           1. 点击编辑器中的 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> 齿轮图标。
           2. 选择“隐藏详细信息”。
-          3. 编辑详细信息概要并添加内容。
+          3. 编辑详细信息摘要并添加内容。
           [/details]
 
           你可以使用编辑器中的 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> 齿轮图标在你的下一个回复中添加详细信息部分吗？
diff --git a/plugins/styleguide/config/locales/client.ja.yml b/plugins/styleguide/config/locales/client.ja.yml
index 6731366004..2a63e3c86f 100644
--- a/plugins/styleguide/config/locales/client.ja.yml
+++ b/plugins/styleguide/config/locales/client.ja.yml
@@ -58,7 +58,7 @@ ja:
         footer_message:
           title: "フッターメッセージ"
         signup_cta:
-          title: "サインアップ CTA"
+          title: "アカウント登録 CTA"
         topic_timer_info:
           title: "トピックタイマー"
         topic_footer_buttons:
diff --git a/public/500.ja.html b/public/500.ja.html
index 01f73f1589..fc8a20d81d 100644
--- a/public/500.ja.html
+++ b/public/500.ja.html
@@ -8,6 +8,6 @@
     <h1>おっとっと</h1>
     <p>このディスカッションフォーラムを提供するソフトウェアで、予期しない問題が発生しました。 ご不便をおかけして申し訳ございません。</p>
     <p>エラーに関する詳細情報がログに記録され、自動通知が生成されました。 それを見てみましょう。</p>
-    <p>これ以上のアクションは必要ありません。 ただし、エラー状態が続く場合は、 サイトのフィードバックカテゴリにディスカッショントピックを投稿することでエラーを再現するための手順などの追加の詳細を提供することができます。</p>
+    <p>これ以上の操作は必要ありません。 ただし、エラー状態が続く場合は、 サイトのフィードバックカテゴリにディスカッショントピックを投稿することでエラーを再現するための手順などの追加の詳細を提供することができます。</p>
 </body>
 </html>

From 18c32a809b36fc171916ae751d91ecd49cf45910 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Thu, 22 Jul 2021 17:42:47 +0300
Subject: [PATCH 73/77] FIX: Validate email_accent_bg_color color (#13778)

Using an invalid value was allowed. This commit tries to automatically
fix the color by adding missing # symbol or will show an error to the
user if it is not possible and it is not a CSS color either.
---
 .../admin/addon/components/color-input.js     | 18 ++++++++-
 config/locales/server.en.yml                  |  1 +
 config/site_settings.yml                      | 11 +++++-
 lib/validators/css_color_validator.rb         | 39 +++++++++++++++++++
 .../validators/css_color_validator_spec.rb    | 23 +++++++++++
 5 files changed, 88 insertions(+), 4 deletions(-)
 create mode 100644 lib/validators/css_color_validator.rb
 create mode 100644 spec/components/validators/css_color_validator_spec.rb

diff --git a/app/assets/javascripts/admin/addon/components/color-input.js b/app/assets/javascripts/admin/addon/components/color-input.js
index c563fedc94..91aeaec6e0 100644
--- a/app/assets/javascripts/admin/addon/components/color-input.js
+++ b/app/assets/javascripts/admin/addon/components/color-input.js
@@ -22,9 +22,21 @@ export default Component.extend({
     return this.onlyHex ? 6 : null;
   }),
 
+  normalize(color) {
+    if (/^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$/.test(color)) {
+      if (!color.startsWith("#")) {
+        color = "#" + color;
+      }
+    }
+
+    return color;
+  },
+
   @action
   onHexInput(color) {
-    this.attrs.onChangeColor && this.attrs.onChangeColor(color || "");
+    if (this.attrs.onChangeColor) {
+      this.attrs.onChangeColor(this.normalize(color || ""));
+    }
   },
 
   @observes("hexValue", "brightnessValue", "valid")
@@ -32,7 +44,9 @@ export default Component.extend({
     const hex = this.hexValue;
     let text = this.element.querySelector("input.hex-input");
 
-    this.attrs.onChangeColor && this.attrs.onChangeColor(hex);
+    if (this.attrs.onChangeColor) {
+      this.attrs.onChangeColor(this.normalize(hex));
+    }
 
     if (this.valid) {
       this.styleSelection &&
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 6e787d7265..ce7d3b1279 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2324,6 +2324,7 @@ en:
     allow_changing_staged_user_tracking: "Allow a staged user's category and tag notification preferences to be changed by an admin user."
 
     errors:
+      invalid_css_color: "Invalid color. Enter a color name or hex value."
       invalid_email: "Invalid email address."
       invalid_username: "There's no user with that username."
       invalid_group: "There's no group with that name."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index b01c9fc426..363aacc249 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1064,8 +1064,15 @@ email:
   email_accent_bg_color:
     type: color
     default: "#2F70AC"
-  email_accent_fg_color: "#FFFFFF"
-  email_link_color: "#006699"
+    validator: "CssColorValidator"
+  email_accent_fg_color:
+    type: color
+    default: "#FFFFFF"
+    validator: "CssColorValidator"
+  email_link_color:
+    type: color
+    default: "#006699"
+    validator: "CssColorValidator"
   show_topic_featured_link_in_digest: false
   email_custom_headers: "Auto-Submitted: auto-generated"
   email_subject: "[%{site_name}] %{optional_pm}%{optional_cat}%{topic_title}"
diff --git a/lib/validators/css_color_validator.rb b/lib/validators/css_color_validator.rb
new file mode 100644
index 0000000000..630e9cad57
--- /dev/null
+++ b/lib/validators/css_color_validator.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+class CssColorValidator
+  COLORS = %w{
+    aliceblue antiquewhite aqua aquamarine azure beige bisque black
+    blanchedalmond blue blueviolet brown burlywood cadetblue chartreuse
+    chocolate coral cornflowerblue cornsilk crimson cyan darkblue darkcyan
+    darkgoldenrod darkgray darkgreen darkgrey darkkhaki darkmagenta
+    darkolivegreen darkorange darkorchid darkred darksalmon darkseagreen
+    darkslateblue darkslategray darkslategrey darkturquoise darkviolet
+    deeppink deepskyblue dimgray dimgrey dodgerblue firebrick floralwhite
+    forestgreen fuchsia gainsboro ghostwhite gold goldenrod gray green
+    greenyellow grey honeydew hotpink indianred indigo ivory khaki lavender
+    lavenderblush lawngreen lemonchiffon lightblue lightcoral lightcyan
+    lightgoldenrodyellow lightgray lightgreen lightgrey lightpink lightsalmon
+    lightseagreen lightskyblue lightslategray lightslategrey lightsteelblue
+    lightyellow lime limegreen linen magenta maroon mediumaquamarine
+    mediumblue mediumorchid mediumpurple mediumseagreen mediumslateblue
+    mediumspringgreen mediumturquoise mediumvioletred midnightblue mintcream
+    mistyrose moccasin navajowhite navy oldlace olive olivedrab orange
+    orangered orchid palegoldenrod palegreen paleturquoise palevioletred
+    papayawhip peachpuff peru pink plum powderblue purple red rosybrown
+    royalblue saddlebrown salmon sandybrown seagreen seashell sienna silver
+    skyblue slateblue slategray slategrey snow springgreen steelblue tan teal
+    thistle tomato turquoise violet wheat white whitesmoke yellow yellowgreen
+  }
+
+  def initialize(opts = {})
+    @opts = opts
+  end
+
+  def valid_value?(val)
+    !!(val =~ /^#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$/ || COLORS.include?(val&.downcase))
+  end
+
+  def error_message
+    I18n.t("site_settings.errors.invalid_css_color")
+  end
+end
diff --git a/spec/components/validators/css_color_validator_spec.rb b/spec/components/validators/css_color_validator_spec.rb
new file mode 100644
index 0000000000..db754808b1
--- /dev/null
+++ b/spec/components/validators/css_color_validator_spec.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe CssColorValidator do
+  subject { described_class.new }
+
+  it "validates hex colors" do
+    expect(subject.valid_value?('#0')).to eq(false)
+    expect(subject.valid_value?('#00')).to eq(false)
+    expect(subject.valid_value?('#000')).to eq(true)
+    expect(subject.valid_value?('#0000')).to eq(false)
+    expect(subject.valid_value?('#00000')).to eq(false)
+    expect(subject.valid_value?('#000000')).to eq(true)
+  end
+
+  it "validates css colors" do
+    expect(subject.valid_value?('red')).to eq(true)
+    expect(subject.valid_value?('green')).to eq(true)
+    expect(subject.valid_value?('blue')).to eq(true)
+    expect(subject.valid_value?('hello')).to eq(false)
+  end
+end

From 73e8183ffb8fe5587650ee097837fe5eaeed6441 Mon Sep 17 00:00:00 2001
From: Andrei Prigorshnev <a.prigorshnev@gmail.com>
Date: Thu, 22 Jul 2021 18:48:26 +0400
Subject: [PATCH 74/77] FIX: update the list of users after user joined group
 (#13822)

* Make UI update after user have joined a public group

* Check if a group exists in the join method
---
 app/assets/javascripts/discourse/app/models/group.js | 2 +-
 app/controllers/groups_controller.rb                 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/models/group.js b/app/assets/javascripts/discourse/app/models/group.js
index 6ce97c898c..b65f29e61b 100644
--- a/app/assets/javascripts/discourse/app/models/group.js
+++ b/app/assets/javascripts/discourse/app/models/group.js
@@ -131,7 +131,7 @@ const Group = RestModel.extend({
     return ajax(`/groups/${this.id}/join.json`, {
       type: "PUT",
     }).then(() => {
-      this.findMembers();
+      this.findMembers({}, true);
     });
   },
 
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 4db8e7b921..fd09ecba2e 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -398,6 +398,7 @@ class GroupsController < ApplicationController
     end
 
     group = Group.find(params[:id])
+    raise Discourse::NotFound unless group
     raise Discourse::InvalidAccess unless group.public_admission
 
     return if group.users.exists?(id: current_user.id)

From 27211ee7bbf661991cbf8a69f98d490be233ae26 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Thu, 22 Jul 2021 18:59:59 +0300
Subject: [PATCH 75/77] FIX: Ensure browser history contains correct URLs
 (#13367)

Clicking on an incomplete link to a topic (/t/ID or /t/SLUG) from
another post could replace current history entry or create two: one for
the incomplete URL and another one for the correct one. Going back was
either impossible or took the user to a redirect loop, redirected back
to /t/ID which redirected them again to /t/SLUG/ID.
---
 .../discourse/app/routes/topic-by-slug-or-id.js     | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/app/routes/topic-by-slug-or-id.js b/app/assets/javascripts/discourse/app/routes/topic-by-slug-or-id.js
index 0cfe24473f..f2805aedd1 100644
--- a/app/assets/javascripts/discourse/app/routes/topic-by-slug-or-id.js
+++ b/app/assets/javascripts/discourse/app/routes/topic-by-slug-or-id.js
@@ -12,6 +12,17 @@ export default DiscourseRoute.extend({
   },
 
   afterModel(result) {
-    DiscourseURL.routeTo(result.url, { replaceURL: true });
+    // Using { replaceURL: true } to replace the current incomplete URL with
+    // the complete one is working incorrectly.
+    //
+    // Let's consider an example where the user is at /t/-/1. If they click on
+    // a link to /t/2 the expected behavior is to take the user to /t/2 that
+    // will redirect to /t/-/2 and generate a history with two entries: /t/-/1
+    // followed by /t/-/2.
+    //
+    // When { replaceURL: true } is present, the history contains a single
+    // entry /t/-/2. This suggests that `afterModel` is called in the context
+    // of the referrer replacing its entry with the new one.
+    DiscourseURL.routeTo(result.url);
   },
 });

From 8bc01c1bb5108cfd04b002fbc820befc3571e186 Mon Sep 17 00:00:00 2001
From: Andrei Prigorshnev <a.prigorshnev@gmail.com>
Date: Thu, 22 Jul 2021 20:14:18 +0400
Subject: [PATCH 76/77] DEV: extract leave_group method from the
 group#remove_member method (#13823)

* Copy remove_member to new `leave` method

* Remove unneeded code from the leave method

* Rearrange the leave method

* Remove unneeded code from the remove_member method

* Add tests

* Implement on the client side
---
 .../app/components/group-membership-button.js |  2 +-
 .../javascripts/discourse/app/models/group.js |  6 ++
 app/controllers/groups_controller.rb          | 27 ++++---
 config/routes.rb                              |  1 +
 spec/requests/groups_controller_spec.rb       | 74 +++++++++++++++----
 5 files changed, 83 insertions(+), 27 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/group-membership-button.js b/app/assets/javascripts/discourse/app/components/group-membership-button.js
index d5481e2c61..4c8239aedc 100644
--- a/app/assets/javascripts/discourse/app/components/group-membership-button.js
+++ b/app/assets/javascripts/discourse/app/components/group-membership-button.js
@@ -37,7 +37,7 @@ export default Component.extend({
   removeFromGroup() {
     const model = this.model;
     model
-      .removeMember(this.currentUser)
+      .leave()
       .then(() => {
         model.set("is_group_user", false);
         this.appEvents.trigger("group:leave", model);
diff --git a/app/assets/javascripts/discourse/app/models/group.js b/app/assets/javascripts/discourse/app/models/group.js
index b65f29e61b..75d91ea0c9 100644
--- a/app/assets/javascripts/discourse/app/models/group.js
+++ b/app/assets/javascripts/discourse/app/models/group.js
@@ -114,6 +114,12 @@ const Group = RestModel.extend({
     }).then(() => this.findMembers(params, true));
   },
 
+  leave() {
+    return ajax(`/groups/${this.id}/leave.json`, {
+      type: "DELETE",
+    }).then(() => this.findMembers({}, true));
+  },
+
   addMembers(usernames, filter, notifyUsers, emails = []) {
     return ajax(`/groups/${this.id}/members.json`, {
       type: "PUT",
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index fd09ecba2e..440deb4894 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -464,7 +464,7 @@ class GroupsController < ApplicationController
   def remove_member
     group = Group.find_by(id: params[:id])
     raise Discourse::NotFound unless group
-    group.public_exit ? ensure_logged_in : guardian.ensure_can_edit!(group)
+    guardian.ensure_can_edit!(group)
 
     # Maintain backwards compatibility
     params[:usernames] = params[:username] if params[:username].present?
@@ -475,16 +475,6 @@ class GroupsController < ApplicationController
       'user_ids or usernames or user_emails must be present'
     ) if users.empty?
 
-    if group.public_exit
-      if !guardian.can_log_group_changes?(group) && current_user != users.first
-        raise Discourse::InvalidAccess
-      end
-
-      unless current_user.staff?
-        RateLimiter.new(current_user, "public_group_membership", 3, 1.minute).performed!
-      end
-    end
-
     removed_users = []
     skipped_users = []
 
@@ -507,6 +497,21 @@ class GroupsController < ApplicationController
     )
   end
 
+  def leave
+    ensure_logged_in
+    unless current_user.staff?
+      RateLimiter.new(current_user, "public_group_membership", 3, 1.minute).performed!
+    end
+
+    group = Group.find_by(id: params[:id])
+    raise Discourse::NotFound unless group
+    raise Discourse::InvalidAccess unless group.public_exit
+
+    if group.remove(current_user)
+      GroupActionLogger.new(current_user, group).log_remove_user_from_group(current_user)
+    end
+  end
+
   MAX_NOTIFIED_OWNERS ||= 20
 
   def request_membership
diff --git a/config/routes.rb b/config/routes.rb
index 97c5b30351..6c111ec05f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -604,6 +604,7 @@ Discourse::Application.routes.draw do
           put "members" => "groups#add_members"
           put "join" => "groups#join"
           delete "members" => "groups#remove_member"
+          delete "leave" => "groups#leave"
           post "request_membership" => "groups#request_membership"
           put "handle_membership_request" => "groups#handle_membership_request"
           post "notifications" => "groups#set_notifications"
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index 5e890d608b..9d6236580b 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -1234,11 +1234,11 @@ describe GroupsController do
   describe "membership edits" do
     fab!(:admin) { Fabricate(:admin) }
 
-    before do
-      sign_in(admin)
-    end
-
     context '#add_members' do
+      before do
+        sign_in(admin)
+      end
+
       it "can make incremental adds" do
         user2 = Fabricate(:user)
 
@@ -1562,6 +1562,10 @@ describe GroupsController do
     end
 
     context '#remove_member' do
+      before do
+        sign_in(admin)
+      end
+
       it "cannot remove members from automatic groups" do
         group.update!(automatic: true)
 
@@ -1641,17 +1645,6 @@ describe GroupsController do
             end
           end
 
-          it 'should allow a user to leave a group' do
-            sign_in(other_user)
-
-            expect do
-              delete "/groups/#{group.id}/members.json",
-              params: { username: other_user.username }
-            end.to change { group.users.count }.by(-1)
-
-            expect(response.status).to eq(200)
-          end
-
           it 'should not allow a underprivileged user to leave a group for another user' do
             sign_in(user)
 
@@ -1716,6 +1709,57 @@ describe GroupsController do
         end
       end
     end
+
+    context '#leave' do
+      let(:group_with_public_exit) { Fabricate(:group, public_exit: true, users: [user]) }
+
+      it 'should allow a user to leave a group with public exit' do
+        sign_in(user)
+
+        expect do
+          delete "/groups/#{group_with_public_exit.id}/leave.json"
+        end.to change { group_with_public_exit.users.count }.by(-1)
+
+        expect(response.status).to eq(204)
+      end
+
+      it 'should not allow a user to leave a group without public exit' do
+        sign_in(user)
+
+        expect do
+          delete "/groups/#{group.id}/leave.json"
+        end.not_to change { group.users.count }
+
+        expect(response).to be_forbidden
+      end
+
+      it 'should not allow an anonymous user to call the leave method' do
+        expect do
+          delete "/groups/#{group_with_public_exit.id}/leave.json"
+        end.not_to change { group_with_public_exit.users.count }
+
+        expect(response).to be_forbidden
+      end
+
+      it 'the leave method is idempotent' do
+        sign_in(user)
+
+        expect do
+          delete "/groups/#{group_with_public_exit.id}/leave.json"
+        end.to change { group_with_public_exit.users.count }.by(-1)
+        expect(response.status).to eq(204)
+
+        expect do
+          delete "/groups/#{group_with_public_exit.id}/leave.json"
+        end.not_to change { group_with_public_exit.users.count }
+        expect(response.status).to eq(204)
+
+        expect do
+          delete "/groups/#{group_with_public_exit.id}/leave.json"
+        end.not_to change { group_with_public_exit.users.count }
+        expect(response.status).to eq(204)
+      end
+    end
   end
 
   describe "#handle_membership_request" do

From cb858af8c79032a90bc374d566225c75e22cf6a6 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Thu, 22 Jul 2021 12:23:50 -0400
Subject: [PATCH 77/77] Version bump to v2.8.0.beta4 (#13824)

---
 lib/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/version.rb b/lib/version.rb
index 88a32aa503..bd5490b567 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -10,7 +10,7 @@ module Discourse
       MAJOR = 2
       MINOR = 8
       TINY  = 0
-      PRE   = 'beta3'
+      PRE   = 'beta4'
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
     end